Update from 0.9.7-stable. Also repatch and rebuild error codes.

[openssl.git] / crypto / rsa / rsa_oaep.c

diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 66d33e538a6125dac1a29440800d05dbc98b5579..45d6f6ef8a5eaa5435cc3e313cc7415ab1b405ff 100644 (file)
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -170,28 +170,30 @@ decoding_err:
        return -1;
        }
 
-int MGF1(unsigned char *mask, long len,
-       const unsigned char *seed, long seedlen)
+int PKCS1_MGF1(unsigned char *mask, long len,
+       const unsigned char *seed, long seedlen, const EVP_MD *dgst)
        {
        long i, outlen = 0;
        unsigned char cnt[4];
        EVP_MD_CTX c;
-       unsigned char md[SHA_DIGEST_LENGTH];
+       unsigned char md[EVP_MAX_MD_SIZE];
+       int mdlen;
 
        EVP_MD_CTX_init(&c);
+       mdlen = EVP_MD_size(dgst);
        for (i = 0; outlen < len; i++)
                {
                cnt[0] = (unsigned char)((i >> 24) & 255);
                cnt[1] = (unsigned char)((i >> 16) & 255);
                cnt[2] = (unsigned char)((i >> 8)) & 255;
                cnt[3] = (unsigned char)(i & 255);
-               EVP_DigestInit_ex(&c,EVP_sha1(), NULL);
+               EVP_DigestInit_ex(&c,dgst, NULL);
                EVP_DigestUpdate(&c, seed, seedlen);
                EVP_DigestUpdate(&c, cnt, 4);
-               if (outlen + SHA_DIGEST_LENGTH <= len)
+               if (outlen + mdlen <= len)
                        {
                        EVP_DigestFinal_ex(&c, mask + outlen, NULL);
-                       outlen += SHA_DIGEST_LENGTH;
+                       outlen += mdlen;
                        }
                else
                        {
@@ -203,4 +205,9 @@ int MGF1(unsigned char *mask, long len,
        EVP_MD_CTX_cleanup(&c);
        return 0;
        }
+
+int MGF1(unsigned char *mask, long len, const unsigned char *seed, long seedlen)
+       {
+       return PKCS1_MGF1(mask, len, seed, seedlen, EVP_sha1());
+       }
 #endif