From: FdaSilvaYY <fdasilvayy@gmail.com>
Date: Mon, 4 Apr 2016 22:13:06 +0000 (+0200)
Subject: Fix a shadow symbol warning
X-Git-Tag: OpenSSL_1_1_0-pre5~132
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=173f613b6a9029f34454b642ee4f3db6c6566fcb;p=oweals%2Fopenssl.git

Fix a shadow symbol warning

... comes from c5137473bdc7.
Fix Travis builds.

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

diff --git a/apps/req.c b/apps/req.c
index 561cccc98f..b6a545fa38 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;