Commit 0484af22 authored by Pauli's avatar Pauli
Browse files

Coverity CID 1444959: Integer handling issues 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8888)
parent a05bf83c

crypto/asn1/p5_scrypt.c

+7 −2
Original line number Diff line number Diff line
@@ -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 */