diff options
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
| -rw-r--r-- | src/lib/libssl/s3_clnt.c | 6 |
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 | ||
| 1311 | int | 1311 | int |
| 1312 | ssl3_get_key_exchange(SSL *s) | 1312 | ssl3_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; |
