[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  3d0cf918078fecee8b040807a2603e41937092f6 (commit)
      from  abdd677125f3a9e3082f8c5692203590fdb9b860 (commit)


- Log -----------------------------------------------------------------
commit 3d0cf918078fecee8b040807a2603e41937092f6
Author: Rich Salz <rsalz at openssl.org>
Date:   Mon Jan 26 11:04:26 2015 -0500

    Remove obsolete support for old code.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/rsa/rsa_sign.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c
index cdf8d79..cc45e40 100644
--- a/crypto/rsa/rsa_sign.c
+++ b/crypto/rsa/rsa_sign.c
@@ -246,19 +246,8 @@ int int_rsa_verify(int dtype, const unsigned char *m,
                 OBJ_nid2ln(dtype));
 #endif
         if (sigtype != dtype) {
-            if (((dtype == NID_md5) &&
-                 (sigtype == NID_md5WithRSAEncryption)) ||
-                ((dtype == NID_md2) &&
-                 (sigtype == NID_md2WithRSAEncryption))) {
-                /* ok, we will let it through */
-#if !defined(OPENSSL_NO_STDIO)
-                fprintf(stderr,
-                        "signature has problems, re-make with post SSLeay045\n");
-#endif
-            } else {
-                RSAerr(RSA_F_INT_RSA_VERIFY, RSA_R_ALGORITHM_MISMATCH);
-                goto err;
-            }
+            RSAerr(RSA_F_INT_RSA_VERIFY, RSA_R_ALGORITHM_MISMATCH);
+            goto err;
         }
         if (rm) {
             const EVP_MD *md;