Commit 361ecb1d authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix EVP_CIPHER_CTX_rand_key() 



Make sure we use the the correct key length in EVP_CIPHER_CTX_rand_key().
Now that ciphers may come from providers we need to make sure we ask the
provider for the value if appropriate.

Reviewed-by: default avatarBernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/8794)
parent a5cf198b

crypto/evp/evp_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key) 
{

    if (ctx->cipher->flags & EVP_CIPH_RAND_KEY)

        return EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_RAND_KEY, 0, key);

    if (RAND_priv_bytes(key, ctx->key_len) <= 0)

    if (RAND_priv_bytes(key, EVP_CIPHER_CTX_key_length(ctx)) <= 0)

        return 0;

    return 1;

}