]> git.kaiwu.me - nginx.git/commitdiff
SSL: removed redundant "pkey" variable.
authorMaxim Dounin <mdounin@mdounin.ru>
Fri, 8 Mar 2019 23:55:43 +0000 (02:55 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Fri, 8 Mar 2019 23:55:43 +0000 (02:55 +0300)
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.

src/event/ngx_event_openssl.c

index 987b381197616a9763d1e0bd71484f77992df8ff..0a0afdc5c858570f6fe301661d82e5ddd50d9e8f 100644 (file)
@@ -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, ':');