Welcome! Log In Create A New Profile

Advanced

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

Maxim Dounin
March 08, 2019 07:02PM
details: https://hg.nginx.org/nginx/rev/b6dc8a12c07a
branches:
changeset: 7476:b6dc8a12c07a
user: Maxim Dounin <mdounin@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, ':');
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
Subject Author Views Posted

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

Maxim Dounin 43 March 08, 2019 07:02PM



Sorry, you do not have permission to post/reply in this forum.

Online Users

Guests: 98
Record Number of Users: 6 on February 13, 2018
Record Number of Guests: 421 on December 02, 2018
Powered by nginx      Powered by FreeBSD      PHP Powered      Powered by MariaDB      ipv6 ready