From: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Date: Tue, 17 Apr 2018 06:39:42 +0000 (+0200)
Subject: p5_scrypt.c: fix error check of RAND_bytes() call
X-Git-Tag: OpenSSL_1_1_0i~186
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=69712507e73437553790ccac6f19a9ded996c0cd;p=oweals%2Fopenssl.git

p5_scrypt.c: fix error check of RAND_bytes() call

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/5977)
---

diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c
index 4cb7837498..a5232fe702 100644
--- a/crypto/asn1/p5_scrypt.c
+++ b/crypto/asn1/p5_scrypt.c
@@ -91,7 +91,7 @@ X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
     if (EVP_CIPHER_iv_length(cipher)) {
         if (aiv)
             memcpy(iv, aiv, EVP_CIPHER_iv_length(cipher));
-        else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0)
+        else if (RAND_bytes(iv, EVP_CIPHER_iv_length(cipher)) <= 0)
             goto err;
     }