Mercurial > hg > nginx

comparison src/event/ngx_event_openssl.c @ 7476:b6dc8a12c07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 09 Mar 2019 02:55:43 +0300
parents 3f1db95d758a
children c74904a17021
comparison
equal deleted inserted replaced
7475:49f9d2f7d887 7476:b6dc8a12c07a
699 699
700 if (ngx_strncmp(key->data, "engine:", sizeof("engine:") - 1) == 0) { 700 if (ngx_strncmp(key->data, "engine:", sizeof("engine:") - 1) == 0) {
701 701
702 #ifndef OPENSSL_NO_ENGINE 702 #ifndef OPENSSL_NO_ENGINE
703 703
704 u_char *p, *last; 704 u_char *p, *last;
705 ENGINE *engine; 705 ENGINE *engine;
706 EVP_PKEY *pkey;
707 706
708 p = key->data + sizeof("engine:") - 1; 707 p = key->data + sizeof("engine:") - 1;
709 last = (u_char *) ngx_strchr(p, ':'); 708 last = (u_char *) ngx_strchr(p, ':');
710 709
711 if (last == NULL) { 710 if (last == NULL) {