Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2019-03-09 02:55:43 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2019-03-09 02:55:43 +0300
commit762d98abedd89c834713451cd1ba3d33777c63d9 (patch)
tree973bd92161b491d30465152e009a4545a206b576 /src
parent0ad4393e30c119d250415cb769e3d8bc8dce5186 (diff)
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 (limited to 'src')
-rw-r--r--src/event/ngx_event_openssl.c5
1 files 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, ':');