[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  03883e7e168b0f5ef52a516eeb86346b767e0298 (commit)
      from  190b9a03b72a8029c27e4bd0ab000129e240a413 (commit)


- Log -----------------------------------------------------------------
commit 03883e7e168b0f5ef52a516eeb86346b767e0298
Author: Paul Yang <yang.yang at baishancloud.com>
Date:   Sat Jul 29 00:24:27 2017 +0800

    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 at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4043)

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

Summary of changes:
 apps/rsa.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rsa.c b/apps/rsa.c
index 5adb93d..ebb02ea 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -217,7 +217,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");
@@ -226,7 +226,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));