diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_crpt.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crpt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crpt.c b/src/lib/libcrypto/pkcs12/p12_crpt.c index 0f215d2fe2..f2d635fc62 100644 --- a/src/lib/libcrypto/pkcs12/p12_crpt.c +++ b/src/lib/libcrypto/pkcs12/p12_crpt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_crpt.c,v 1.12 2015/09/10 15:56:25 jsing Exp $ */ | 1 | /* $OpenBSD: p12_crpt.c,v 1.13 2016/11/08 20:01:06 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 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -94,8 +94,11 @@ PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, | |||
| 94 | 94 | ||
| 95 | if (!pbe->iter) | 95 | if (!pbe->iter) |
| 96 | iter = 1; | 96 | iter = 1; |
| 97 | else | 97 | else if ((iter = ASN1_INTEGER_get(pbe->iter)) <= 0) { |
| 98 | iter = ASN1_INTEGER_get (pbe->iter); | 98 | PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN, PKCS12_R_DECODE_ERROR); |
| 99 | PBEPARAM_free(pbe); | ||
| 100 | return 0; | ||
| 101 | } | ||
| 99 | salt = pbe->salt->data; | 102 | salt = pbe->salt->data; |
| 100 | saltlen = pbe->salt->length; | 103 | saltlen = pbe->salt->length; |
| 101 | if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID, | 104 | if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID, |