This commit was manufactured by cvs2svn to create branch

[oweals/openssl.git] / crypto / rsa / rsa_pss.c

diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c
index 3280c9d40c0c63b767fbb31bb457848ced23c664..ac211e2ffe0121028a94f2d897347c9354c3c3d3 100644 (file)
--- a/crypto/rsa/rsa_pss.c
+++ b/crypto/rsa/rsa_pss.c
@@ -1,5 +1,5 @@
 /* rsa_pss.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2005.
  */
 /* ====================================================================
@@ -64,7 +64,7 @@
 #include <openssl/rand.h>
 #include <openssl/sha.h>
 
-const static unsigned char zeroes[] = {0,0,0,0,0,0,0,0};
+static const unsigned char zeroes[] = {0,0,0,0,0,0,0,0};
 
 #if defined(_MSC_VER) && defined(_ARM_)
 #pragma optimize("g", off)
@@ -82,6 +82,8 @@ int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
        unsigned char H_[EVP_MAX_MD_SIZE];
 
        hLen = EVP_MD_size(Hash);
+       if (hLen < 0)
+               goto err;
        /*
         * Negative sLen has special meanings:
         *      -1      sLen == hLen
@@ -126,7 +128,8 @@ int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
                RSAerr(RSA_F_RSA_VERIFY_PKCS1_PSS, ERR_R_MALLOC_FAILURE);
                goto err;
                }
-       PKCS1_MGF1(DB, maskedDBLen, H, hLen, Hash);
+       if (PKCS1_MGF1(DB, maskedDBLen, H, hLen, Hash) < 0)
+               goto err;
        for (i = 0; i < maskedDBLen; i++)
                DB[i] ^= EM[i];
        if (MSBits)
@@ -177,6 +180,8 @@ int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
        EVP_MD_CTX ctx;
 
        hLen = EVP_MD_size(Hash);
+       if (hLen < 0)
+               goto err;
        /*
         * Negative sLen has special meanings:
         *      -1      sLen == hLen
@@ -217,7 +222,7 @@ int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
                                ERR_R_MALLOC_FAILURE);
                        goto err;
                        }
-               if (!RAND_bytes(salt, sLen))
+               if (RAND_bytes(salt, sLen) <= 0)
                        goto err;
                }
        maskedDBLen = emLen - hLen - 1;
@@ -232,7 +237,8 @@ int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
        EVP_MD_CTX_cleanup(&ctx);
 
        /* Generate dbMask in place then perform XOR on it */
-       PKCS1_MGF1(EM, maskedDBLen, H, hLen, Hash);
+       if (PKCS1_MGF1(EM, maskedDBLen, H, hLen, Hash))
+               goto err;
 
        p = EM;