summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_clnt.c
diff options
context:
space:
mode:
authorjsing <>2016-11-04 19:11:43 +0000
committerjsing <>2016-11-04 19:11:43 +0000
commit8d8efa38bd41538db6d565bf25bc49b76a253a26 (patch)
treea70ac1b5758ec70b7bbd4ddbcfedfb12f1e00711 /src/lib/libssl/s3_clnt.c
parenta470b542c929f0406be16f7f1964389a373c84d5 (diff)
downloadopenbsd-8d8efa38bd41538db6d565bf25bc49b76a253a26.tar.gz
openbsd-8d8efa38bd41538db6d565bf25bc49b76a253a26.tar.bz2
openbsd-8d8efa38bd41538db6d565bf25bc49b76a253a26.zip
Rename ssl3_get_key_exchange() to ssl3_get_server_key_exchange(), since
that's what it really is. ok miod@
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r--src/lib/libssl/s3_clnt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index 6ec97e95be..dd5121366d 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.142 2016/11/04 18:42:26 jsing Exp $ */ 1/* $OpenBSD: s3_clnt.c,v 1.143 2016/11/04 19:11:43 jsing 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 *
@@ -310,7 +310,7 @@ ssl3_connect(SSL *s)
310 310
311 case SSL3_ST_CR_KEY_EXCH_A: 311 case SSL3_ST_CR_KEY_EXCH_A:
312 case SSL3_ST_CR_KEY_EXCH_B: 312 case SSL3_ST_CR_KEY_EXCH_B:
313 ret = ssl3_get_key_exchange(s); 313 ret = ssl3_get_server_key_exchange(s);
314 if (ret <= 0) 314 if (ret <= 0)
315 goto end; 315 goto end;
316 s->state = SSL3_ST_CR_CERT_REQ_A; 316 s->state = SSL3_ST_CR_CERT_REQ_A;
@@ -1309,7 +1309,7 @@ ssl3_get_server_kex_ecdhe(SSL *s, EVP_PKEY **pkey, unsigned char **pp, long *nn)
1309} 1309}
1310 1310
1311int 1311int
1312ssl3_get_key_exchange(SSL *s) 1312ssl3_get_server_key_exchange(SSL *s)
1313{ 1313{
1314 unsigned char *q, md_buf[EVP_MAX_MD_SIZE*2]; 1314 unsigned char *q, md_buf[EVP_MAX_MD_SIZE*2];
1315 EVP_MD_CTX md_ctx; 1315 EVP_MD_CTX md_ctx;