summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorQin Long <qin.long@intel.com>2017-03-15 23:43:20 +0800
committerRichard Levitte <levitte@openssl.org>2017-03-29 07:37:02 +0200
commitdc8da7b1b8ba276f179ea1232c9df764dcd38775 (patch)
tree7f067ee21c29795279e082cca04dad608602ada8 /ssl
parentcff55b90e95e1fa6c90154f93f12363e761d88c7 (diff)
Fix the build warning under OPENSSL_NO_GOST
Variable 'pktype' was set but not used under OPENSSL_NO_GOST. This change will fix the build warning under [-Werror=unused-but-set-variable]. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2961)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/statem/statem_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 0cde2e750a..860b8141bd 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -281,7 +281,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
unsigned char *gost_data = NULL;
#endif
int al = SSL_AD_INTERNAL_ERROR, ret = MSG_PROCESS_ERROR;
- int type = 0, j, pktype;
+ int type = 0, j;
unsigned int len;
X509 *peer;
const EVP_MD *md = NULL;
@@ -303,7 +303,6 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
goto f_err;
}
- pktype = EVP_PKEY_id(pkey);
type = X509_certificate_type(peer, pkey);
if (!(type & EVP_PKT_SIGN)) {
@@ -384,6 +383,7 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt)
}
#ifndef OPENSSL_NO_GOST
{
+ int pktype = EVP_PKEY_id(pkey);
if (pktype == NID_id_GostR3410_2001
|| pktype == NID_id_GostR3410_2012_256
|| pktype == NID_id_GostR3410_2012_512) {