WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:cyassl/cyassl

pull/1/head
toddouska 2014-03-26 12:15:04 -07:00
parent 43909ac725 dd61daef70
commit 23300a201f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cyassl/ctaocrypt/types.h
View File

@ -273,7 +273,8 @@ enum {
DYNAMIC_TYPE_CAVIUM_RSA = 41, DYNAMIC_TYPE_CAVIUM_RSA = 41,
DYNAMIC_TYPE_X509 = 42, DYNAMIC_TYPE_X509 = 42,
DYNAMIC_TYPE_TLSX = 43, DYNAMIC_TYPE_TLSX = 43,
DYNAMIC_TYPE_OCSP = 44 DYNAMIC_TYPE_OCSP = 44,
DYNAMIC_TYPE_SIGNATURE = 45
}; };
/* max error buffer string size */ /* max error buffer string size */

21
src/internal.c
View File

@ -1324,7 +1324,7 @@ void FreeX509(CYASSL_X509* x509)
if (x509->pubKey.buffer) if (x509->pubKey.buffer)
XFREE(x509->pubKey.buffer, NULL, DYNAMIC_TYPE_PUBLIC_KEY); XFREE(x509->pubKey.buffer, NULL, DYNAMIC_TYPE_PUBLIC_KEY);
XFREE(x509->derCert.buffer, NULL, DYNAMIC_TYPE_SUBJECT_CN); XFREE(x509->derCert.buffer, NULL, DYNAMIC_TYPE_SUBJECT_CN);
XFREE(x509->sig.buffer, NULL, 0); XFREE(x509->sig.buffer, NULL, DYNAMIC_TYPE_SIGNATURE);
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
XFREE(x509->authKeyId, NULL, 0); XFREE(x509->authKeyId, NULL, 0);
XFREE(x509->subjKeyId, NULL, 0); XFREE(x509->subjKeyId, NULL, 0);
@ -3172,14 +3172,17 @@ int CopyDecodedToX509(CYASSL_X509* x509, DecodedCert* dCert)
ret = MEMORY_E; ret = MEMORY_E;
} }
x509->sig.buffer = (byte*)XMALLOC(dCert->sigLength, NULL, 0); if (dCert->signature != NULL && dCert->sigLength != 0) {
if (x509->sig.buffer == NULL) { x509->sig.buffer = (byte*)XMALLOC(
ret = MEMORY_E; dCert->sigLength, NULL, DYNAMIC_TYPE_SIGNATURE);
} if (x509->sig.buffer == NULL) {
else { ret = MEMORY_E;
XMEMCPY(x509->sig.buffer, dCert->signature, dCert->sigLength); }
x509->sig.length = dCert->sigLength; else {
x509->sigOID = dCert->signatureOID; XMEMCPY(x509->sig.buffer, dCert->signature, dCert->sigLength);
x509->sig.length = dCert->sigLength;
x509->sigOID = dCert->signatureOID;
}
} }
/* store cert for potential retrieval */ /* store cert for potential retrieval */