From 19ec1b6acc3e3c1c1156d9578424119a3a98dd63 Mon Sep 17 00:00:00 2001 From: tb <> Date: Fri, 3 Jul 2020 04:12:51 +0000 Subject: 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 --- src/lib/libssl/ssl_srvr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libssl/ssl_srvr.c') 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 @@ -/* $OpenBSD: ssl_srvr.c,v 1.79 2020/06/05 17:53:26 jsing Exp $ */ +/* $OpenBSD: ssl_srvr.c,v 1.80 2020/07/03 04:12:50 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1025,7 +1025,7 @@ ssl3_get_client_hello(SSL *s) goto f_err; } - if (!tlsext_server_parse(s, &cbs, &al, SSL_TLSEXT_MSG_CH)) { + if (!tlsext_server_parse(s, SSL_TLSEXT_MSG_CH, &cbs, &al)) { SSLerror(s, SSL_R_PARSE_TLSEXT); goto f_err; } @@ -1233,7 +1233,7 @@ ssl3_send_server_hello(SSL *s) goto err; /* TLS extensions */ - if (!tlsext_server_build(s, &server_hello, SSL_TLSEXT_MSG_SH)) { + if (!tlsext_server_build(s, SSL_TLSEXT_MSG_SH, &server_hello)) { SSLerror(s, ERR_R_INTERNAL_ERROR); goto err; } -- cgit v1.2.3-55-g6feb