diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pvkfmt.c')
-rw-r--r-- | src/lib/libcrypto/pem/pvkfmt.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/libcrypto/pem/pvkfmt.c b/src/lib/libcrypto/pem/pvkfmt.c index 32fcc181f7..ca7e908c29 100644 --- a/src/lib/libcrypto/pem/pvkfmt.c +++ b/src/lib/libcrypto/pem/pvkfmt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pvkfmt.c,v 1.10 2014/07/11 15:35:53 miod Exp $ */ | 1 | /* $OpenBSD: pvkfmt.c,v 1.11 2014/07/12 16:03:37 miod Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2005. | 3 | * project 2005. |
4 | */ | 4 | */ |
@@ -349,12 +349,9 @@ b2i_dss(const unsigned char **in, unsigned int length, unsigned int bitlen, | |||
349 | 349 | ||
350 | memerr: | 350 | memerr: |
351 | PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE); | 351 | PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE); |
352 | if (dsa) | 352 | DSA_free(dsa); |
353 | DSA_free(dsa); | 353 | EVP_PKEY_free(ret); |
354 | if (ret) | 354 | BN_CTX_free(ctx); |
355 | EVP_PKEY_free(ret); | ||
356 | if (ctx) | ||
357 | BN_CTX_free(ctx); | ||
358 | return NULL; | 355 | return NULL; |
359 | } | 356 | } |
360 | 357 | ||
@@ -402,10 +399,8 @@ b2i_rsa(const unsigned char **in, unsigned int length, unsigned int bitlen, | |||
402 | 399 | ||
403 | memerr: | 400 | memerr: |
404 | PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE); | 401 | PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE); |
405 | if (rsa) | 402 | RSA_free(rsa); |
406 | RSA_free(rsa); | 403 | EVP_PKEY_free(ret); |
407 | if (ret) | ||
408 | EVP_PKEY_free(ret); | ||
409 | return NULL; | 404 | return NULL; |
410 | } | 405 | } |
411 | 406 | ||