summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 15dda5108c..be9c27f73f 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_srvr.c,v 1.94 2021/02/20 14:14:16 tb Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.95 2021/02/20 14:16:56 tb 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 *
@@ -1126,8 +1126,8 @@ ssl3_get_client_hello(SSL *s)
1126 /* 1126 /*
1127 * We now have the following setup. 1127 * We now have the following setup.
1128 * client_random 1128 * client_random
1129 * cipher_list - our prefered list of ciphers 1129 * cipher_list - our prefered list of ciphers
1130 * ciphers - the clients prefered list of ciphers 1130 * ciphers - the clients prefered list of ciphers
1131 * compression - basically ignored right now 1131 * compression - basically ignored right now
1132 * ssl version is set - sslv3 1132 * ssl version is set - sslv3
1133 * s->session - The ssl session has been setup. 1133 * s->session - The ssl session has been setup.
@@ -1786,7 +1786,7 @@ ssl3_get_client_kex_rsa(SSL *s, CBS *cbs)
1786 1786
1787 s->session->master_key_length = 1787 s->session->master_key_length =
1788 tls1_generate_master_secret(s, 1788 tls1_generate_master_secret(s,
1789 s->session->master_key, p, SSL_MAX_MASTER_KEY_LENGTH); 1789 s->session->master_key, p, SSL_MAX_MASTER_KEY_LENGTH);
1790 1790
1791 freezero(pms, pms_len); 1791 freezero(pms, pms_len);
1792 1792
@@ -1968,7 +1968,7 @@ ssl3_get_client_kex_ecdhe_ecx(SSL *s, CBS *cbs)
1968static int 1968static int
1969ssl3_get_client_kex_ecdhe(SSL *s, CBS *cbs) 1969ssl3_get_client_kex_ecdhe(SSL *s, CBS *cbs)
1970{ 1970{
1971 if (S3I(s)->tmp.x25519 != NULL) 1971 if (S3I(s)->tmp.x25519 != NULL)
1972 return ssl3_get_client_kex_ecdhe_ecx(s, cbs); 1972 return ssl3_get_client_kex_ecdhe_ecx(s, cbs);
1973 1973
1974 return ssl3_get_client_kex_ecdhe_ecp(s, cbs); 1974 return ssl3_get_client_kex_ecdhe_ecp(s, cbs);
@@ -2356,7 +2356,7 @@ ssl3_get_client_certificate(SSL *s)
2356 if (S3I(s)->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) { 2356 if (S3I(s)->tmp.message_type == SSL3_MT_CLIENT_KEY_EXCHANGE) {
2357 if ((s->verify_mode & SSL_VERIFY_PEER) && 2357 if ((s->verify_mode & SSL_VERIFY_PEER) &&
2358 (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) { 2358 (s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) {
2359 SSLerror(s, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE); 2359 SSLerror(s, SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
2360 al = SSL_AD_HANDSHAKE_FAILURE; 2360 al = SSL_AD_HANDSHAKE_FAILURE;
2361 goto fatal_err; 2361 goto fatal_err;
2362 } 2362 }