[nginx] SSL: removed redundant "pkey" variable.

Maxim Dounin mdounin at mdounin.ru
Sat Mar 9 00:01:27 UTC 2019


details:   https://hg.nginx.org/nginx/rev/b6dc8a12c07a
branches:  
changeset: 7476:b6dc8a12c07a
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Sat Mar 09 02:55:43 2019 +0300
description:
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.

diffstat:

 src/event/ngx_event_openssl.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (15 lines):

diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
--- 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 
 
 #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, ':');


More information about the nginx-devel mailing list