From 83d806decdbef2c775b63a9b728f0eda9cc35d5c Mon Sep 17 00:00:00 2001 From: tb Date: Wed, 20 Jul 2022 13:43:33 +0000 Subject: [PATCH] Change various ALPN related internal struct members Change alpn_client_proto_list and alpn_selected from unsigned char * to uint8_t and change alpn_client_proto_list_len to be a size_t instead of an unsigned int. ok jsing --- lib/libssl/ssl_locl.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libssl/ssl_locl.h b/lib/libssl/ssl_locl.h index a1b36e549af..34fb5815a97 100644 --- a/lib/libssl/ssl_locl.h +++ b/lib/libssl/ssl_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_locl.h,v 1.414 2022/07/17 14:49:01 jsing Exp $ */ +/* $OpenBSD: ssl_locl.h,v 1.415 2022/07/20 13:43:33 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -863,8 +863,8 @@ typedef struct ssl_ctx_internal_st { void *alpn_select_cb_arg; /* Client list of supported protocols in wire format. */ - unsigned char *alpn_client_proto_list; - unsigned int alpn_client_proto_list_len; + uint8_t *alpn_client_proto_list; + size_t alpn_client_proto_list_len; size_t tlsext_ecpointformatlist_length; uint8_t *tlsext_ecpointformatlist; /* our list */ @@ -929,8 +929,8 @@ typedef struct ssl_internal_st { unsigned long mode; /* API behaviour */ /* Client list of supported protocols in wire format. */ - unsigned char *alpn_client_proto_list; - unsigned int alpn_client_proto_list_len; + uint8_t *alpn_client_proto_list; + size_t alpn_client_proto_list_len; /* QUIC transport params we will send */ uint8_t *quic_transport_params; @@ -1221,7 +1221,7 @@ typedef struct ssl3_state_st { * protocol that the server selected once the ServerHello has been * processed. */ - unsigned char *alpn_selected; + uint8_t *alpn_selected; size_t alpn_selected_len; /* Contains the QUIC transport params received from our peer. */ -- 2.20.1