From: Maxim Dounin <mdounin@mdounin.ru>
Date: Fri, 8 Mar 2019 23:55:43 +0000 (+0300)
Subject: SSL: removed redundant "pkey" variable.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=762d98abedd89c834713451cd1ba3d33777c63d9;p=nginx.git

SSL: removed redundant "pkey" variable.

It was accidentally introduced in 77436d9951a1 (1.15.9).  In MSVC 2015
and more recent MSVC versions it triggers warning C4456 (declaration of
'pkey' hides previous local declaration).  Previously, all such warnings
were resolved in 2a621245f4cf.

Reported by Steve Stevenson.
---

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
index 987b38119..0a0afdc5c 100644
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -701,9 +701,8 @@ ngx_ssl_load_certificate_key(ngx_pool_t *pool, char **err,
 
 #ifndef OPENSSL_NO_ENGINE
 
-        u_char      *p, *last;
-        ENGINE      *engine;
-        EVP_PKEY    *pkey;
+        u_char  *p, *last;
+        ENGINE  *engine;
 
         p = key->data + sizeof("engine:") - 1;
         last = (u_char *) ngx_strchr(p, ':');