[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  427e91d928ce7a1c583e4bba761cb17a85ac95b4 (commit)
      from  9ba9d81b1c1645ed56a79b841e3fb63e5cbd7617 (commit)


- Log -----------------------------------------------------------------
commit 427e91d928ce7a1c583e4bba761cb17a85ac95b4
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Sun Sep 9 16:33:12 2018 +0200

    crypto/rsa/rsa_pss.c: silence coverity warning
    
    Reported by Coverity Scan (CID 1439138)
    [extended tests]
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7156)

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

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

diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index 26d5f36..f7c575d 100644
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -244,7 +244,7 @@ int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
 
  err:
     EVP_MD_CTX_free(ctx);
-    OPENSSL_clear_free(salt, sLen);
+    OPENSSL_clear_free(salt, (size_t)sLen); /* salt != NULL implies sLen > 0 */
 
     return ret;