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

fix valgrind warnings from yesterday changes

Browse Source
This commit is contained in:
toddouska
2012-10-31 12:54:56 -07:00
parent 01138a5c53
commit 905cf9c018
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ctaocrypt/src/asn.c
View File

@@ -4082,6 +4082,7 @@ int CyaSSL_PemCertToDer(const char* fileName, unsigned char* derBuf, int derSz);
/* Set cert issuer from issuerFile in PEM */ /* Set cert issuer from issuerFile in PEM */
int SetIssuer(Cert* cert, const char* issuerFile) int SetIssuer(Cert* cert, const char* issuerFile)
{ {
int ret;
int derSz; int derSz;
byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT); byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT);
@@ -4091,16 +4092,17 @@ int SetIssuer(Cert* cert, const char* issuerFile)
} }
derSz = CyaSSL_PemCertToDer(issuerFile, der, EIGHTK_BUF); derSz = CyaSSL_PemCertToDer(issuerFile, der, EIGHTK_BUF);
cert->selfSigned = 0; cert->selfSigned = 0;
ret = SetNameFromCert(&cert->issuer, der, derSz);
XFREE(der, NULL, DYNAMIC_TYPE_CERT); XFREE(der, NULL, DYNAMIC_TYPE_CERT);
return SetNameFromCert(&cert->issuer, der, derSz); return ret;
} }
/* Set cert subject from subjectFile in PEM */ /* Set cert subject from subjectFile in PEM */
int SetSubject(Cert* cert, const char* subjectFile) int SetSubject(Cert* cert, const char* subjectFile)
{ {
int ret;
int derSz; int derSz;
byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT); byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT);
@@ -4109,10 +4111,10 @@ int SetSubject(Cert* cert, const char* subjectFile)
return MEMORY_E; return MEMORY_E;
} }
derSz = CyaSSL_PemCertToDer(subjectFile, der, EIGHTK_BUF); derSz = CyaSSL_PemCertToDer(subjectFile, der, EIGHTK_BUF);
ret = SetNameFromCert(&cert->subject, der, derSz);
XFREE(der, NULL, DYNAMIC_TYPE_CERT); XFREE(der, NULL, DYNAMIC_TYPE_CERT);
return SetNameFromCert(&cert->subject, der, derSz); return ret;
} }
@@ -4121,6 +4123,7 @@ int SetSubject(Cert* cert, const char* subjectFile)
/* Set atl names from file in PEM */ /* Set atl names from file in PEM */
int SetAltNames(Cert* cert, const char* file) int SetAltNames(Cert* cert, const char* file)
{ {
int ret;
int derSz; int derSz;
byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT); byte* der = (byte*)XMALLOC(EIGHTK_BUF, NULL, DYNAMIC_TYPE_CERT);
@@ -4129,9 +4132,10 @@ int SetAltNames(Cert* cert, const char* file)
return MEMORY_E; return MEMORY_E;
} }
derSz = CyaSSL_PemCertToDer(file, der, EIGHTK_BUF); derSz = CyaSSL_PemCertToDer(file, der, EIGHTK_BUF);
ret = SetAltNamesFromCert(cert, der, derSz);
XFREE(der, NULL, DYNAMIC_TYPE_CERT); XFREE(der, NULL, DYNAMIC_TYPE_CERT);
return SetAltNamesFromCert(cert, der, derSz); return ret;
} }
#endif /* CYASSL_ALT_NAMES */ #endif /* CYASSL_ALT_NAMES */

2
ctaocrypt/src/rsa.c
View File

@@ -498,7 +498,7 @@ int MakeRsaKey(RsaKey* key, int size, long e, RNG* rng)
err = mp_init_multi(&key->n, &key->e, &key->d, &key->p, &key->q, NULL); err = mp_init_multi(&key->n, &key->e, &key->d, &key->p, &key->q, NULL);
if (err == MP_OKAY) if (err == MP_OKAY)
err = mp_init_multi(&key->dP, &key->dP, &key->u, NULL, NULL, NULL); err = mp_init_multi(&key->dP, &key->dQ, &key->u, NULL, NULL, NULL);
if (err == MP_OKAY) if (err == MP_OKAY)
err = mp_sub_d(&p, 1, &tmp2); /* tmp2 = p-1 */ err = mp_sub_d(&p, 1, &tmp2); /* tmp2 = p-1 */

2
ctaocrypt/test/test.c
View File

@@ -1679,6 +1679,7 @@ int rsa_test(void)
fclose(pemFile); fclose(pemFile);
free(pem); free(pem);
free(derCert); free(derCert);
FreeRsaKey(&caKey);
} }
#ifdef HAVE_NTRU #ifdef HAVE_NTRU
{ {
@@ -1795,6 +1796,7 @@ int rsa_test(void)
fclose(ntruPrivFile); fclose(ntruPrivFile);
free(pem); free(pem);
free(derCert); free(derCert);
FreeRsaKey(&caKey);
} }
#endif /* HAVE_NTRU */ #endif /* HAVE_NTRU */
#endif /* CYASSL_CERT_GEN */ #endif /* CYASSL_CERT_GEN */