diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-04-12 13:58:14 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2021-04-16 12:10:08 +1000 |
| commit | 42e7d2f10e3658c0c248df8a6edf3c48c477e4b0 (patch) | |
| tree | 1122340c23e67327e2673fd516c5be2dc666e228 /crypto/asn1/p5_pbev2.c | |
| parent | 34ed73339602c361d09fe4233d65cef996356239 (diff) | |
| download | openssl-42e7d2f10e3658c0c248df8a6edf3c48c477e4b0.zip openssl-42e7d2f10e3658c0c248df8a6edf3c48c477e4b0.tar.gz openssl-42e7d2f10e3658c0c248df8a6edf3c48c477e4b0.tar.bz2 | |
Add more negative checks for integers passed to OPENSSL_malloc().
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14830)
Diffstat (limited to 'crypto/asn1/p5_pbev2.c')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 738e3a0..1049f01 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -160,6 +160,8 @@ X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen, kdf->salt->value.octet_string = osalt; kdf->salt->type = V_ASN1_OCTET_STRING; + if (saltlen < 0) + goto merr; if (saltlen == 0) saltlen = PKCS5_SALT_LEN; if ((osalt->data = OPENSSL_malloc(saltlen)) == NULL) |