summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
authortb <>2020-07-03 04:12:51 +0000
committertb <>2020-07-03 04:12:51 +0000
commit19ec1b6acc3e3c1c1156d9578424119a3a98dd63 (patch)
treeccbfc5a18a8593e33c9c504671e7d32e7f8e6c1a /src/lib/libssl/ssl_srvr.c
parentba5d20ce0e8a0f27f37d05f5e9e4457b8712655d (diff)
downloadopenbsd-19ec1b6acc3e3c1c1156d9578424119a3a98dd63.tar.gz
openbsd-19ec1b6acc3e3c1c1156d9578424119a3a98dd63.tar.bz2
openbsd-19ec1b6acc3e3c1c1156d9578424119a3a98dd63.zip
Improve argument order for the internal tlsext API
Move is_server and msg_type right after the SSL object so that CBS and CBB and alert come last. This brings these functions more in line with other internal functions and separates state from data. requested by jsing
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 706ad1453b..67671f276c 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.79 2020/06/05 17:53:26 jsing Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.80 2020/07/03 04:12:50 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 *
@@ -1025,7 +1025,7 @@ ssl3_get_client_hello(SSL *s)
1025 goto f_err; 1025 goto f_err;
1026 } 1026 }
1027 1027
1028 if (!tlsext_server_parse(s, &cbs, &al, SSL_TLSEXT_MSG_CH)) { 1028 if (!tlsext_server_parse(s, SSL_TLSEXT_MSG_CH, &cbs, &al)) {
1029 SSLerror(s, SSL_R_PARSE_TLSEXT); 1029 SSLerror(s, SSL_R_PARSE_TLSEXT);
1030 goto f_err; 1030 goto f_err;
1031 } 1031 }
@@ -1233,7 +1233,7 @@ ssl3_send_server_hello(SSL *s)
1233 goto err; 1233 goto err;
1234 1234
1235 /* TLS extensions */ 1235 /* TLS extensions */
1236 if (!tlsext_server_build(s, &server_hello, SSL_TLSEXT_MSG_SH)) { 1236 if (!tlsext_server_build(s, SSL_TLSEXT_MSG_SH, &server_hello)) {
1237 SSLerror(s, ERR_R_INTERNAL_ERROR); 1237 SSLerror(s, ERR_R_INTERNAL_ERROR);
1238 goto err; 1238 goto err;
1239 } 1239 }