[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[matthias.st.pierre at ncp-e.com]

The branch OpenSSL_1_1_0-stable has been updated
       via  69712507e73437553790ccac6f19a9ded996c0cd (commit)
      from  dbbaeb8973d662ae0d009e0fb6c8975721991b63 (commit)


- Log -----------------------------------------------------------------
commit 69712507e73437553790ccac6f19a9ded996c0cd
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Tue Apr 17 08:39:42 2018 +0200

    p5_scrypt.c: fix error check of RAND_bytes() call
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    (Merged from https://github.com/openssl/openssl/pull/5977)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/p5_scrypt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/asn1/p5_scrypt.c b/crypto/asn1/p5_scrypt.c
index 4cb7837..a5232fe 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;
     }