From 762d98abedd89c834713451cd1ba3d33777c63d9 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Sat, 9 Mar 2019 02:55:43 +0300 Subject: [PATCH] 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. --- src/event/ngx_event_openssl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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, ':');