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

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c
index e2f61f6c08..bd72db8be0 100644
--- a/src/lib/libssl/tls13_client.c
+++ b/src/lib/libssl/tls13_client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_client.c,v 1.65 2020/06/04 18:41:42 tb Exp $ */
+/* $OpenBSD: tls13_client.c,v 1.66 2020/07/03 04:12:51 tb Exp $ */
 /*
  * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
  *
@@ -118,7 +118,7 @@ tls13_client_hello_build(struct tls13_ctx *ctx, CBB *cbb)
         if (!CBB_add_u8(&compression_methods, 0))
                 goto err;
 
-        if (!tlsext_client_build(s, cbb, SSL_TLSEXT_MSG_CH))
+        if (!tlsext_client_build(s, SSL_TLSEXT_MSG_CH, cbb))
                 goto err;
 
         if (!CBB_flush(cbb))
@@ -265,7 +265,7 @@ tls13_server_hello_process(struct tls13_ctx *ctx, CBS *cbs)
                 ctx->hs->hrr = 1;
         }
 
-        if (!tlsext_client_parse(s, cbs, &alert_desc, tlsext_msg_type)) {
+        if (!tlsext_client_parse(s, tlsext_msg_type, cbs, &alert_desc)) {
                 ctx->alert = alert_desc;
                 goto err;
         }
@@ -504,7 +504,7 @@ tls13_server_encrypted_extensions_recv(struct tls13_ctx *ctx, CBS *cbs)
 {
         int alert_desc;
 
-        if (!tlsext_client_parse(ctx->ssl, cbs, &alert_desc, SSL_TLSEXT_MSG_EE)) {
+        if (!tlsext_client_parse(ctx->ssl, SSL_TLSEXT_MSG_EE, cbs, &alert_desc)) {
                 ctx->alert = alert_desc;
                 goto err;
         }
@@ -540,7 +540,7 @@ tls13_server_certificate_request_recv(struct tls13_ctx *ctx, CBS *cbs)
         if (CBS_len(&cert_request_context) != 0)
                 goto err;
 
-        if (!tlsext_client_parse(ctx->ssl, cbs, &alert_desc, SSL_TLSEXT_MSG_CR)) {
+        if (!tlsext_client_parse(ctx->ssl, SSL_TLSEXT_MSG_CR, cbs, &alert_desc)) {
                 ctx->alert = alert_desc;
                 goto err;
         }
@@ -580,8 +580,8 @@ tls13_server_certificate_recv(struct tls13_ctx *ctx, CBS *cbs)
                 if (!CBS_get_u24_length_prefixed(&cert_list, &cert_data))
                         goto err;
 
-                if (!tlsext_client_parse(ctx->ssl, &cert_list, &alert_desc,
-                    SSL_TLSEXT_MSG_CT)) {
+                if (!tlsext_client_parse(ctx->ssl, SSL_TLSEXT_MSG_CT,
+                    &cert_list, &alert_desc)) {
                         ctx->alert = alert_desc;
                         goto err;
                 }