Port from stable branch.

diff --git a/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head
index 5ed3ee1e7145d595bf73686ef224b40687950aad..d9ec6d26c985f094648823a347fc98eecad48d84 100644 (file)
--- a/ChangeLog.0_9_7-stable_not-in-head
+++ b/ChangeLog.0_9_7-stable_not-in-head
@@ -381,16 +381,6 @@ be added to the end of this file.
 
        Dont forget req.
 
-2003-04-10 03:13  steve
-
-       Changed:
-               crypto/rsa/rsa_sign.c (1.11.2.6), "Exp", lines: +2 -2
-
-       Only call redirected rsa_sign or rsa_verify if the pointer is set.
-
-               This allows, for example, a smart card to redirect rsa_sign
-       and keep the default rsa_verify.
-
 2003-07-03 23:43  levitte
 
        Changed:

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index 9e7dfd1927bf55dd9a9191dd53cf2b80647fb11a..230ec6d7ea2a981ead6a4a8fa45d1f38128298e5 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);
@@ -155,7 +155,7 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
                return(0);
                }
 
-       if(rsa->flags & RSA_FLAG_SIGN_VER)
+       if((rsa->flags & RSA_FLAG_SIGN_VER) && rsa->meth->rsa_verify)
                {
                return rsa->meth->rsa_verify(dtype, m, m_len,
                        sigbuf, siglen, rsa);