import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@

1 files changed, 6 insertions, 3 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_sign.c b/src/lib/libcrypto/rsa/rsa_sign.c
index 8a1e642183..cee09eccb1 100644
--- a/src/lib/libcrypto/rsa/rsa_sign.c
+++ b/src/lib/libcrypto/rsa/rsa_sign.c
@@ -169,7 +169,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);
-                        return(0);
+                        goto err;
         }
         i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
 
@@ -222,8 +222,11 @@ int RSA_verify(int dtype, const unsigned char *m, unsigned int m_len,
         }
 err:
         if (sig != NULL) X509_SIG_free(sig);
-        OPENSSL_cleanse(s,(unsigned int)siglen);
-        OPENSSL_free(s);
+        if (s != NULL)
+                {
+                OPENSSL_cleanse(s,(unsigned int)siglen);
+                OPENSSL_free(s);
+                }
         return(ret);
         }