From: Richard Levitte <levitte@openssl.org>
Date: Wed, 24 Aug 2016 10:46:09 +0000 (+0200)
Subject: Trust RSA_check_key() to return correct values
X-Git-Tag: OpenSSL_1_1_0~16
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=63db6b772fa264a62927f6a3584733192dc5a352

Trust RSA_check_key() to return correct values

In apps/rsa.c, we were second guessing RSA_check_key() to leave error
codes lying around without returning -1 properly.  However, this also
catches other errors that are lying around and that we should not care
about.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/rsa.c b/apps/rsa.c
index f67387e27f..bd2f53a6f4 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -230,10 +230,7 @@ int rsa_main(int argc, char **argv)
                            ERR_reason_error_string(err));
                 ERR_get_error(); /* remove e from error stack */
             }
-        }
-
-        /* should happen only if r == -1 */
-        if (r == -1 || ERR_peek_error() != 0) {
+        } else if (r == -1) {
             ERR_print_errors(bio_err);
             goto end;
         }