summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbcook <>2016-11-06 09:44:51 +0000
committerbcook <>2016-11-06 09:44:51 +0000
commit6b2a2b502522f866715d2336e80d76737bf3781d (patch)
tree3eaececb83779e5c6b99f0d8ee3493bd61a8d754 /src
parent856e341b82b98ee38fdfc357830a1a7ccafe068c (diff)
downloadopenbsd-6b2a2b502522f866715d2336e80d76737bf3781d.tar.gz
openbsd-6b2a2b502522f866715d2336e80d76737bf3781d.tar.bz2
openbsd-6b2a2b502522f866715d2336e80d76737bf3781d.zip
remove unused variable
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/s3_clnt.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index ff015568e4..57c11f458a 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_clnt.c,v 1.144 2016/11/05 08:26:36 jsing Exp $ */ 1/* $OpenBSD: s3_clnt.c,v 1.145 2016/11/06 09:44:51 bcook Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -1149,7 +1149,7 @@ ssl3_get_server_kex_dhe(SSL *s, EVP_PKEY **pkey, unsigned char **pp, long *nn)
1149 *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_RSA_ENC].x509); 1149 *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_RSA_ENC].x509);
1150 else if (alg_a & SSL_aDSS) 1150 else if (alg_a & SSL_aDSS)
1151 *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_DSA_SIGN].x509); 1151 *pkey = X509_get_pubkey(sc->peer_pkeys[SSL_PKEY_DSA_SIGN].x509);
1152 else 1152 else
1153 /* XXX - Anonymous DH, so no certificate or pkey. */ 1153 /* XXX - Anonymous DH, so no certificate or pkey. */
1154 *pkey = NULL; 1154 *pkey = NULL;
1155 1155
@@ -1322,7 +1322,7 @@ ssl3_get_server_key_exchange(SSL *s)
1322 SSL3_ST_CR_KEY_EXCH_B, -1, s->max_cert_list, &ok); 1322 SSL3_ST_CR_KEY_EXCH_B, -1, s->max_cert_list, &ok);
1323 if (!ok) 1323 if (!ok)
1324 return ((int)n); 1324 return ((int)n);
1325 1325
1326 EVP_MD_CTX_init(&md_ctx); 1326 EVP_MD_CTX_init(&md_ctx);
1327 1327
1328 if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) { 1328 if (s->s3->tmp.message_type != SSL3_MT_SERVER_KEY_EXCHANGE) {
@@ -1996,13 +1996,10 @@ ssl3_send_client_kex_ecdhe(SSL *s, SESS_CERT *sess_cert, unsigned char *p,
1996 BN_CTX *bn_ctx = NULL; 1996 BN_CTX *bn_ctx = NULL;
1997 unsigned char *encodedPoint = NULL; 1997 unsigned char *encodedPoint = NULL;
1998 unsigned char *key = NULL; 1998 unsigned char *key = NULL;
1999 unsigned long alg_k;
2000 int encoded_pt_len = 0; 1999 int encoded_pt_len = 0;
2001 int key_size, n; 2000 int key_size, n;
2002 int ret = -1; 2001 int ret = -1;
2003 2002
2004 alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
2005
2006 if (sess_cert->peer_ecdh_tmp == NULL) { 2003 if (sess_cert->peer_ecdh_tmp == NULL) {
2007 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE); 2004 ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
2008 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, 2005 SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE,