summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_packet.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_packet.c')
-rw-r--r--src/lib/libssl/ssl_packet.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl_packet.c b/src/lib/libssl/ssl_packet.c
index 091685b217..b2c3d0f2a0 100644
--- a/src/lib/libssl/ssl_packet.c
+++ b/src/lib/libssl/ssl_packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_packet.c,v 1.13 2022/02/05 14:54:10 jsing Exp $ */ 1/* $OpenBSD: ssl_packet.c,v 1.14 2022/10/02 16:36:41 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -84,7 +84,7 @@ ssl_convert_sslv2_client_hello(SSL *s)
84 84
85 memset(&cbb, 0, sizeof(cbb)); 85 memset(&cbb, 0, sizeof(cbb));
86 86
87 CBS_init(&cbs, s->internal->packet, SSL3_RT_HEADER_LENGTH); 87 CBS_init(&cbs, s->packet, SSL3_RT_HEADER_LENGTH);
88 88
89 if (!CBS_get_u16(&cbs, &record_length) || 89 if (!CBS_get_u16(&cbs, &record_length) ||
90 !CBS_get_u8(&cbs, &message_type) || 90 !CBS_get_u8(&cbs, &message_type) ||
@@ -119,17 +119,17 @@ ssl_convert_sslv2_client_hello(SSL *s)
119 if (n != record_length + 2) 119 if (n != record_length + 2)
120 return n; 120 return n;
121 121
122 tls1_transcript_record(s, s->internal->packet + 2, 122 tls1_transcript_record(s, s->packet + 2,
123 s->internal->packet_length - 2); 123 s->packet_length - 2);
124 s->internal->mac_packet = 0; 124 s->mac_packet = 0;
125 125
126 if (s->internal->msg_callback) 126 if (s->msg_callback)
127 s->internal->msg_callback(0, SSL2_VERSION, 0, 127 s->msg_callback(0, SSL2_VERSION, 0,
128 s->internal->packet + 2, s->internal->packet_length - 2, s, 128 s->packet + 2, s->packet_length - 2, s,
129 s->internal->msg_callback_arg); 129 s->msg_callback_arg);
130 130
131 /* Decode the SSLv2 record containing the client hello. */ 131 /* Decode the SSLv2 record containing the client hello. */
132 CBS_init(&cbs, s->internal->packet, s->internal->packet_length); 132 CBS_init(&cbs, s->packet, s->packet_length);
133 133
134 if (!CBS_get_u16(&cbs, &record_length)) 134 if (!CBS_get_u16(&cbs, &record_length))
135 return -1; 135 return -1;
@@ -212,9 +212,9 @@ ssl_convert_sslv2_client_hello(SSL *s)
212 if (data_len > s->s3->rbuf.len) 212 if (data_len > s->s3->rbuf.len)
213 goto err; 213 goto err;
214 214
215 s->internal->packet = s->s3->rbuf.buf; 215 s->packet = s->s3->rbuf.buf;
216 s->internal->packet_length = data_len; 216 s->packet_length = data_len;
217 memcpy(s->internal->packet, data, data_len); 217 memcpy(s->packet, data, data_len);
218 ret = 1; 218 ret = 1;
219 219
220 err: 220 err:
@@ -240,7 +240,7 @@ ssl_server_legacy_first_packet(SSL *s)
240 if (SSL_is_dtls(s)) 240 if (SSL_is_dtls(s))
241 return 1; 241 return 1;
242 242
243 CBS_init(&header, s->internal->packet, SSL3_RT_HEADER_LENGTH); 243 CBS_init(&header, s->packet, SSL3_RT_HEADER_LENGTH);
244 244
245 if (ssl_is_sslv3_handshake(&header) == 1) 245 if (ssl_is_sslv3_handshake(&header) == 1)
246 return 1; 246 return 1;