generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RT3856: Fix memory leaks in test code

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 2d540402aac7a05af9c99b58864d53c0201a0b42)
This commit is contained in:
Russell Webb 2015-06-13 10:35:55 -04:00 committed by Rich Salz
parent c61bb1abaf
commit 295c629ab1
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/bn/bntest.c
View File

@ -1042,7 +1042,6 @@ int test_mod_exp_mont_consttime(BIO *bp, BN_CTX *ctx)
int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx) int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx)
{ {
BIGNUM *a, *p, *m, *d, *e; BIGNUM *a, *p, *m, *d, *e;
BN_MONT_CTX *mont; BN_MONT_CTX *mont;
a = BN_new(); a = BN_new();
@ -1050,7 +1049,6 @@ int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx)
m = BN_new(); m = BN_new();
d = BN_new(); d = BN_new();
e = BN_new(); e = BN_new();
mont = BN_MONT_CTX_new(); mont = BN_MONT_CTX_new();
BN_bntest_rand(m, 1024, 0, 1); /* must be odd for montgomery */ BN_bntest_rand(m, 1024, 0, 1); /* must be odd for montgomery */
@ -1099,6 +1097,7 @@ int test_mod_exp_mont5(BIO *bp, BN_CTX *ctx)
fprintf(stderr, "Modular exponentiation test failed!\n"); fprintf(stderr, "Modular exponentiation test failed!\n");
return 0; return 0;
} }
BN_MONT_CTX_free(mont);
BN_free(a); BN_free(a);
BN_free(p); BN_free(p);
BN_free(m); BN_free(m);

3
crypto/hmac/hmactest.c
View File

@ -195,6 +195,7 @@ int main(int argc, char *argv[])
} }
printf("test 4 ok\n"); printf("test 4 ok\n");
test5: test5:
HMAC_CTX_cleanup(&ctx);
HMAC_CTX_init(&ctx); HMAC_CTX_init(&ctx);
if (HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) { if (HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, NULL, NULL)) {
printf("Should fail to initialise HMAC with empty MD (test 5)\n"); printf("Should fail to initialise HMAC with empty MD (test 5)\n");
@ -284,6 +285,7 @@ test5:
printf("test 5 ok\n"); printf("test 5 ok\n");
} }
test6: test6:
HMAC_CTX_cleanup(&ctx);
HMAC_CTX_init(&ctx); HMAC_CTX_init(&ctx);
if (!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) { if (!HMAC_Init_ex(&ctx, test[7].key, test[7].key_len, EVP_sha1(), NULL)) {
printf("Failed to initialise HMAC (test 6)\n"); printf("Failed to initialise HMAC (test 6)\n");
@ -314,6 +316,7 @@ test6:
printf("test 6 ok\n"); printf("test 6 ok\n");
} }
end: end:
HMAC_CTX_cleanup(&ctx);
EXIT(err); EXIT(err);
return (0); return (0);
} }

1
crypto/srp/srptest.c
View File

@ -148,6 +148,7 @@ int main(int argc, char **argv)
ERR_remove_thread_state(NULL); ERR_remove_thread_state(NULL);
ERR_free_strings(); ERR_free_strings();
CRYPTO_mem_leaks(bio_err); CRYPTO_mem_leaks(bio_err);
BIO_free(bio_err);
return 0; return 0;
} }