wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 04:04:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #874 from dgarske/fix_builderrors

Browse Source 
Build fixes to address Jenkins reports
This commit is contained in:
Chris Conlon
2017-04-25 15:14:37 -06:00
committed by GitHub
parent ac2835ec2e be6b12a350
commit 1f923a11ee
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/keys.c
View File

@@ -2278,7 +2278,7 @@ static int SetKeys(Ciphers* enc, Ciphers* dec, Keys* keys, CipherSpecs* specs,
enc->des3 = (Des3*)XMALLOC(sizeof(Des3), heap, DYNAMIC_TYPE_CIPHER); enc->des3 = (Des3*)XMALLOC(sizeof(Des3), heap, DYNAMIC_TYPE_CIPHER);
if (enc->des3 == NULL) if (enc->des3 == NULL)
return MEMORY_E; return MEMORY_E;
XMEMSET(enc->des3, 0, sizeof(Aes)); XMEMSET(enc->des3, 0, sizeof(Des3));
} }
if (dec) { if (dec) {
if (dec->des3 == NULL) if (dec->des3 == NULL)

6
src/ocsp.c
View File

@@ -742,11 +742,15 @@ WOLFSSL_OCSP_BASICRESP* wolfSSL_OCSP_response_get1_basic(OcspResponse* response)
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
bs->source = (byte*)XMALLOC(bs->maxIdx, NULL, DYNAMIC_TYPE_TMP_BUFFER); bs->source = (byte*)XMALLOC(bs->maxIdx, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (bs->status == NULL || bs->source == NULL) { if (bs->status == NULL || bs->source == NULL) {
if (bs->status) XFREE(bs->status, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (bs->source) XFREE(bs->source, NULL, DYNAMIC_TYPE_TMP_BUFFER);
wolfSSL_OCSP_RESPONSE_free(bs); wolfSSL_OCSP_RESPONSE_free(bs);
bs = NULL; bs = NULL;
} }
else {
XMEMCPY(bs->status, response->status, sizeof(CertStatus)); XMEMCPY(bs->status, response->status, sizeof(CertStatus));
XMEMCPY(bs->source, response->source, response->maxIdx); XMEMCPY(bs->source, response->source, response->maxIdx);
}
return bs; return bs;
} }
@@ -765,7 +769,7 @@ OcspRequest* wolfSSL_OCSP_REQUEST_new(void)
void wolfSSL_OCSP_REQUEST_free(OcspRequest* request) void wolfSSL_OCSP_REQUEST_free(OcspRequest* request)
{ {
FreeOcspRequest(request); FreeOcspRequest(request);
XFREE(request, 0, DYNAMIC_TYPE_OPENSSL); XFREE(request, NULL, DYNAMIC_TYPE_OPENSSL);
} }
int wolfSSL_i2d_OCSP_REQUEST(OcspRequest* request, unsigned char** data) int wolfSSL_i2d_OCSP_REQUEST(OcspRequest* request, unsigned char** data)

2
src/ssl.c
View File

@@ -23996,7 +23996,7 @@ int wolfSSL_X509_STORE_CTX_get1_issuer(WOLFSSL_X509 **issuer,
cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL, cert = (DecodedCert*)XMALLOC(sizeof(DecodedCert), NULL,
DYNAMIC_TYPE_TMP_BUFFER); DYNAMIC_TYPE_TMP_BUFFER);
if (cert == NULL) if (cert == NULL)
return NULL; return SSL_FAILURE;
#endif #endif
/* Use existing CA retrieval APIs that use DecodedCert. */ /* Use existing CA retrieval APIs that use DecodedCert. */