[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  63db6b772fa264a62927f6a3584733192dc5a352 (commit)
      from  55d83bf7c10c7b205fffa23fa7c3977491e56c07 (commit)


- Log -----------------------------------------------------------------
commit 63db6b772fa264a62927f6a3584733192dc5a352
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Aug 24 12:46:09 2016 +0200

    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 at openssl.org>

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

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

diff --git a/apps/rsa.c b/apps/rsa.c
index f67387e..bd2f53a 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;
         }