projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e39578
)
Fix a shadow symbol warning
author
FdaSilvaYY
<fdasilvayy@gmail.com>
Mon, 4 Apr 2016 22:13:06 +0000
(
00:13
+0200)
committer
Rich Salz
<rsalz@openssl.org>
Mon, 4 Apr 2016 22:51:23 +0000
(18:51 -0400)
... comes from
c5137473bdc7
.
Fix Travis builds.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
apps/req.c
patch
|
blob
|
history
diff --git
a/apps/req.c
b/apps/req.c
index 561cccc98fa5c82ca2d2525e0df01d9bcbe73243..b6a545fa381e0110ccab88488a6b911a56ee780c 100644
(file)
--- 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 *
t
pubkey = pkey;
- if (pubkey == NULL) {
- pubkey = X509_REQ_get0_pubkey(req);
- if (pubkey == NULL)
+ if (
t
pubkey == NULL) {
+
t
pubkey = X509_REQ_get0_pubkey(req);
+ if (
t
pubkey == NULL)
goto end;
}
- i = X509_REQ_verify(req, pubkey);
+ i = X509_REQ_verify(req,
t
pubkey);
if (i < 0) {
goto end;