diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-05-04 13:13:24 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-05-04 13:20:49 +0100 |
| commit | d5975c8d5a171551dd42ffa18ca12e84f29ad106 (patch) | |
| tree | 7807a5a77f91651e6faf2713e9efa5124bc566e1 /crypto/pkcs12 | |
| parent | 6dccec2b5990cd282725393c21b5524f4f774615 (diff) | |
| download | openssl-d5975c8d5a171551dd42ffa18ca12e84f29ad106.tar.gz | |
reject zero block length in PKCS12 keygen
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index 1a1ea7059c..764f91bab9 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -128,7 +128,7 @@ int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, #endif v = EVP_MD_block_size(md_type); u = EVP_MD_size(md_type); - if (u < 0) + if (u < 0 || v <= 0) goto err; D = OPENSSL_malloc(v); Ai = OPENSSL_malloc(u); |