Implementation of pkey_rsa_verify. Some constification.

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

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index c53ca739149b6b78f76f37f15d96bc53ae30945a..52c8c985d065c7a8582e9ef4ce9345250fa17d29 100644 (file)
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -62,7 +62,6 @@
 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>

-#include <openssl/engine.h>

 
 /* Size of an SSL signature: MD5+SHA1 */
 #define SSL_SIG_LENGTH 36
 
 /* Size of an SSL signature: MD5+SHA1 */
 #define SSL_SIG_LENGTH 36


@@ -77,10 +76,11 @@ 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;
        const unsigned char *s = NULL;
        X509_ALGOR algor;
        ASN1_OCTET_STRING digest;

-       if((rsa->flags & RSA_FLAG_SIGN_VER)
-             && ENGINE_get_RSA(rsa->engine)->rsa_sign)
-             return ENGINE_get_RSA(rsa->engine)->rsa_sign(type,
-                       m, m_len, sigret, siglen, rsa);
+       if((rsa->flags & RSA_FLAG_SIGN_VER) && rsa->meth->rsa_sign)
+               {
+               return rsa->meth->rsa_sign(type, m, m_len,
+                       sigret, siglen, rsa);
+               }

        /* Special case: SSL signature, just check the length */
        if(type == NID_md5_sha1) {
                if(m_len != SSL_SIG_LENGTH) {
        /* Special case: SSL signature, just check the length */
        if(type == NID_md5_sha1) {
                if(m_len != SSL_SIG_LENGTH) {


@@ -136,17 +136,19 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
                *siglen=i;
 
        if(type != NID_md5_sha1) {
                *siglen=i;
 
        if(type != NID_md5_sha1) {

-               memset(tmps,0,(unsigned int)j+1);
+               OPENSSL_cleanse(tmps,(unsigned int)j+1);

                OPENSSL_free(tmps);
        }
        return(ret);
        }
 
                OPENSSL_free(tmps);
        }
        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,
+               const unsigned char *sigbuf, unsigned int siglen,
+               RSA *rsa)

        {
        int i,ret=0,sigtype;
        {
        int i,ret=0,sigtype;

-       unsigned char *p,*s;
+       unsigned char *s;

        X509_SIG *sig=NULL;
 
        if (siglen != (unsigned int)RSA_size(rsa))
        X509_SIG *sig=NULL;
 
        if (siglen != (unsigned int)RSA_size(rsa))


@@ -155,10 +157,15 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                return(0);
                }
 
                return(0);
                }
 

-       if((rsa->flags & RSA_FLAG_SIGN_VER)
-           && ENGINE_get_RSA(rsa->engine)->rsa_verify)
-           return ENGINE_get_RSA(rsa->engine)->rsa_verify(dtype,
-                       m, m_len, sigbuf, siglen, rsa);
+       if((dtype == NID_md5_sha1) && rm)
+               {
+               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);
        if (s == NULL)
 
        s=(unsigned char *)OPENSSL_malloc((unsigned int)siglen);
        if (s == NULL)


@@ -168,7 +175,7 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                }
        if((dtype == NID_md5_sha1) && (m_len != SSL_SIG_LENGTH) ) {
                        RSAerr(RSA_F_RSA_VERIFY,RSA_R_INVALID_MESSAGE_LENGTH);
                }
        if((dtype == NID_md5_sha1) && (m_len != SSL_SIG_LENGTH) ) {
                        RSAerr(RSA_F_RSA_VERIFY,RSA_R_INVALID_MESSAGE_LENGTH);

-                       return(0);
+                       goto err;

        }
        i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
 
        }
        i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
 


@@ -180,7 +187,7 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                                RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
                else ret = 1;
        } else {
                                RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);
                else ret = 1;
        } else {

-               p=s;
+               const unsigned char *p=s;

                sig=d2i_X509_SIG(NULL,&p,(long)i);
 
                if (sig == NULL) goto err;
                sig=d2i_X509_SIG(NULL,&p,(long)i);
 
                if (sig == NULL) goto err;


@@ -211,7 +218,22 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                                goto err;
                                }
                        }
                                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);
                        (memcmp(m,sig->digest->data,m_len) != 0))
                        {
                        RSAerr(RSA_F_RSA_VERIFY,RSA_R_BAD_SIGNATURE);


@@ -221,8 +243,24 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
        }
 err:
        if (sig != NULL) X509_SIG_free(sig);
        }
 err:
        if (sig != NULL) X509_SIG_free(sig);

-       memset(s,0,(unsigned int)siglen);
-       OPENSSL_free(s);
+       if (s != NULL)
+               {
+               OPENSSL_cleanse(s,(unsigned int)siglen);
+               OPENSSL_free(s);
+               }

        return(ret);
        }
 
        return(ret);
        }
 

+int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
+               const 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);
+       }