# HG changeset patch # User Maxim Dounin # Date 1552089343 -10800 # Node ID b6dc8a12c07a5106b5ebea2d83b4736cbeafaf8b # Parent 49f9d2f7d8877cf7d86fc43c07ef86fc494175bc 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 --- 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, ':');