From: Paul Yang <yang.yang@baishancloud.com>
Date: Fri, 28 Jul 2017 16:24:27 +0000 (+0800)
Subject: Fix rsa -check option
X-Git-Tag: OpenSSL_1_1_0g~119
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49616d925251a8d38ef2af55d045a778215a7b55;p=oweals%2Fopenssl.git

Fix rsa -check option

original problem: if a private key is invaild, nothing outputted.

the error filter in apps/rsa.c is not working any more.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4043)

(cherry picked from commit 03883e7e168b0f5ef52a516eeb86346b767e0298)
---

diff --git a/apps/rsa.c b/apps/rsa.c
index 35ab727172..8b15fcba1a 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -215,7 +215,7 @@ int rsa_main(int argc, char **argv)
     }
 
     if (check) {
-        int r = RSA_check_key(rsa);
+        int r = RSA_check_key_ex(rsa, NULL);
 
         if (r == 1)
             BIO_printf(out, "RSA key ok\n");
@@ -224,7 +224,7 @@ int rsa_main(int argc, char **argv)
 
             while ((err = ERR_peek_error()) != 0 &&
                    ERR_GET_LIB(err) == ERR_LIB_RSA &&
-                   ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
+                   ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY_EX &&
                    ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE) {
                 BIO_printf(out, "RSA key error: %s\n",
                            ERR_reason_error_string(err));