Store digests as EVP_MD instead of a NID.

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

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 9e7dfd1927bf55dd9a9191dd53cf2b80647fb11a..4d48164b773809c4f3fa018a6251364eea869684 100644 (file)
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -76,7 +76,7 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
        const unsigned char *s = NULL;
        X509_ALGOR algor;
        ASN1_OCTET_STRING digest;
-       if(rsa->flags & RSA_FLAG_SIGN_VER)
+       if((rsa->flags & RSA_FLAG_SIGN_VER) && rsa->meth->rsa_sign)
                {
                return rsa->meth->rsa_sign(type, m, m_len,
                        sigret, siglen, rsa);
@@ -142,8 +142,10 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
        return(ret);
        }
 
-int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
-            unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
+int int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len,
+               unsigned char *rm, unsigned int *prm_len,
+               unsigned char *sigbuf, unsigned int siglen,
+               RSA *rsa)
        {
        int i,ret=0,sigtype;
        unsigned char *s;
@@ -155,10 +157,14 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                return(0);
                }
 
-       if(rsa->flags & RSA_FLAG_SIGN_VER)
+       if((dtype == NID_md5_sha1) && rm)
                {
-               return rsa->meth->rsa_verify(dtype, m, m_len,
-                       sigbuf, siglen, rsa);
+               i = RSA_public_decrypt((int)siglen,
+                                       sigbuf,rm,rsa,RSA_PKCS1_PADDING);
+               if (i <= 0)
+                       return 0;
+               *prm_len = i;
+               return 1;
                }
 
        s=(unsigned char *)OPENSSL_malloc((unsigned int)siglen);
@@ -212,7 +218,22 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                                goto err;
                                }
                        }
-               if (    ((unsigned int)sig->digest->length != m_len) ||
+               if (rm)
+                       {
+                       const EVP_MD *md;
+                       md = EVP_get_digestbynid(dtype);
+                       if (md && (EVP_MD_size(md) != sig->digest->length))
+                               RSAerr(RSA_F_RSA_VERIFY,
+                                               RSA_R_INVALID_DIGEST_LENGTH);
+                       else
+                               {
+                               memcpy(rm, sig->digest->data,
+                                                       sig->digest->length);
+                               *prm_len = sig->digest->length;
+                               ret = 1;
+                               }
+                       }
+               else if (((unsigned int)sig->digest->length != m_len) ||
                        (memcmp(m,sig->digest->data,m_len) != 0))
                        {
                        RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
@@ -230,3 +251,16 @@ err:
        return(ret);
        }
 
+int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
+               unsigned char *sigbuf, unsigned int siglen,
+               RSA *rsa)
+       {
+
+       if((rsa->flags & RSA_FLAG_SIGN_VER) && rsa->meth->rsa_verify)
+               {
+               return rsa->meth->rsa_verify(dtype, m, m_len,
+                       sigbuf, siglen, rsa);
+               }
+
+       return int_rsa_verify(dtype, m, m_len, NULL, NULL, sigbuf, siglen, rsa);
+       }