diff options
| author | Pauli <paul.dale@oracle.com> | 2019-05-07 10:45:57 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-05-08 09:52:58 +1000 |
| commit | 0484af225d96f449e21f5ad65cfa332e0091260b (patch) | |
| tree | 995ae5b00e096cc8981d8b607079ac1be4f70225 /crypto/asn1 | |
| parent | a05bf83c7964bb3928b323fe356b9f70f105036d (diff) | |
Coverity CID 1444959: Integer handling issues
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8888)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/p5_scrypt.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c index 0382a5fcdc..d6f38e8579 100644 --- a/crypto/asn1/p5_scrypt.c +++ b/crypto/asn1/p5_scrypt.c @@ -217,7 +217,7 @@ int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, uint64_t p, r, N; size_t saltlen; size_t keylen = 0; - int rv = 0; + int t, rv = 0; SCRYPT_PARAMS *sparam = NULL; if (EVP_CIPHER_CTX_cipher(ctx) == NULL) { @@ -234,7 +234,12 @@ int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, goto err; } - keylen = EVP_CIPHER_CTX_key_length(ctx); + t = EVP_CIPHER_CTX_key_length(ctx); + if (t < 0) { + EVPerr(EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN, EVP_R_INVALID_KEY_LENGTH); + goto err; + } + keylen = t; /* Now check the parameters of sparam */ |