[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  173f613b6a9029f34454b642ee4f3db6c6566fcb (commit)
      from  3e3957816c131e536b0b5122b65dcbe28ee6e0ac (commit)


- Log -----------------------------------------------------------------
commit 173f613b6a9029f34454b642ee4f3db6c6566fcb
Author: FdaSilvaYY <fdasilvayy at gmail.com>
Date:   Tue Apr 5 00:13:06 2016 +0200

    Fix a shadow symbol warning
    
    ... comes from c5137473bdc7.
    Fix Travis builds.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 apps/req.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/req.c b/apps/req.c
index 561cccc..b6a545f 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -739,15 +739,15 @@ int req_main(int argc, char **argv)
     }
 
     if (verify && !x509) {
-        EVP_PKEY *pubkey = pkey;
+        EVP_PKEY *tpubkey = pkey;
 
-        if (pubkey == NULL) {
-            pubkey = X509_REQ_get0_pubkey(req);
-            if (pubkey == NULL)
+        if (tpubkey == NULL) {
+            tpubkey = X509_REQ_get0_pubkey(req);
+            if (tpubkey == NULL)
                 goto end;
         }
 
-        i = X509_REQ_verify(req, pubkey);
+        i = X509_REQ_verify(req, tpubkey);
 
         if (i < 0) {
             goto end;