diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_doit.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index 4556949456..cc6fd97b9d 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pk7_doit.c,v 1.27 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.28 2014/07/12 16:03:37 miod Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -184,10 +184,8 @@ pkcs7_encode_rinfo(PKCS7_RECIP_INFO *ri, unsigned char *key, int keylen) | |||
| 184 | ret = 1; | 184 | ret = 1; |
| 185 | 185 | ||
| 186 | err: | 186 | err: |
| 187 | if (pkey) | 187 | EVP_PKEY_free(pkey); |
| 188 | EVP_PKEY_free(pkey); | 188 | EVP_PKEY_CTX_free(pctx); |
| 189 | if (pctx) | ||
| 190 | EVP_PKEY_CTX_free(pctx); | ||
| 191 | free(ek); | 189 | free(ek); |
| 192 | return ret; | 190 | return ret; |
| 193 | } | 191 | } |
| @@ -244,8 +242,7 @@ pkcs7_decrypt_rinfo(unsigned char **pek, int *peklen, PKCS7_RECIP_INFO *ri, | |||
| 244 | *peklen = eklen; | 242 | *peklen = eklen; |
| 245 | 243 | ||
| 246 | err: | 244 | err: |
| 247 | if (pctx) | 245 | EVP_PKEY_CTX_free(pctx); |
| 248 | EVP_PKEY_CTX_free(pctx); | ||
| 249 | if (!ret && ek) | 246 | if (!ret && ek) |
| 250 | free(ek); | 247 | free(ek); |
| 251 | 248 | ||
