summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_clnt.c
diff options
context:
space:
mode:
authortb <>2020-07-03 04:12:51 +0000
committertb <>2020-07-03 04:12:51 +0000
commit3634005e8a2051a239211f692a45371c14e9d8e4 (patch)
treeccbfc5a18a8593e33c9c504671e7d32e7f8e6c1a /src/lib/libssl/ssl_clnt.c
parent310bee1edf5b91769a0ac118970281584681c964 (diff)
downloadopenbsd-3634005e8a2051a239211f692a45371c14e9d8e4.tar.gz
openbsd-3634005e8a2051a239211f692a45371c14e9d8e4.tar.bz2
openbsd-3634005e8a2051a239211f692a45371c14e9d8e4.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_clnt.c')
-rw-r--r--src/lib/libssl/ssl_clnt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 0a1b6ea241..b6dcb8888d 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.69 2020/06/05 17:53:26 jsing Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.70 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 *
@@ -775,7 +775,7 @@ ssl3_send_client_hello(SSL *s)
775 goto err; 775 goto err;
776 776
777 /* TLS extensions */ 777 /* TLS extensions */
778 if (!tlsext_client_build(s, &client_hello, SSL_TLSEXT_MSG_CH)) { 778 if (!tlsext_client_build(s, SSL_TLSEXT_MSG_CH, &client_hello)) {
779 SSLerror(s, ERR_R_INTERNAL_ERROR); 779 SSLerror(s, ERR_R_INTERNAL_ERROR);
780 goto err; 780 goto err;
781 } 781 }
@@ -1024,7 +1024,7 @@ ssl3_get_server_hello(SSL *s)
1024 goto f_err; 1024 goto f_err;
1025 } 1025 }
1026 1026
1027 if (!tlsext_client_parse(s, &cbs, &al, SSL_TLSEXT_MSG_SH)) { 1027 if (!tlsext_client_parse(s, SSL_TLSEXT_MSG_SH, &cbs, &al)) {
1028 SSLerror(s, SSL_R_PARSE_TLSEXT); 1028 SSLerror(s, SSL_R_PARSE_TLSEXT);
1029 goto f_err; 1029 goto f_err;
1030 } 1030 }