diff options
author | jsing <> | 2022-02-05 14:54:10 +0000 |
---|---|---|
committer | jsing <> | 2022-02-05 14:54:10 +0000 |
commit | a463011117e88ea3125fb580b8c6c60d68722651 (patch) | |
tree | da7fe094101bf3711667cf1650e3c6f57a50e2ff /src/lib/libssl/ssl_packet.c | |
parent | 54b37ce29213d429a1f20782418b17863e8b4b9b (diff) | |
download | openbsd-a463011117e88ea3125fb580b8c6c60d68722651.tar.gz openbsd-a463011117e88ea3125fb580b8c6c60d68722651.tar.bz2 openbsd-a463011117e88ea3125fb580b8c6c60d68722651.zip |
Bye bye S3I.
S3I has served us well, however now that libssl is fully opaque it is time
to say goodbye. Aside from removing the calloc/free/memset, the rest is
mechanical sed.
ok inoguchi@ tb@
Diffstat (limited to 'src/lib/libssl/ssl_packet.c')
-rw-r--r-- | src/lib/libssl/ssl_packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_packet.c b/src/lib/libssl/ssl_packet.c index af56dcef7f..091685b217 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.12 2021/07/01 17:53:39 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_packet.c,v 1.13 2022/02/05 14:54:10 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 | * |
@@ -209,10 +209,10 @@ ssl_convert_sslv2_client_hello(SSL *s) | |||
209 | if (!CBB_finish(&cbb, &data, &data_len)) | 209 | if (!CBB_finish(&cbb, &data, &data_len)) |
210 | goto err; | 210 | goto err; |
211 | 211 | ||
212 | if (data_len > S3I(s)->rbuf.len) | 212 | if (data_len > s->s3->rbuf.len) |
213 | goto err; | 213 | goto err; |
214 | 214 | ||
215 | s->internal->packet = S3I(s)->rbuf.buf; | 215 | s->internal->packet = s->s3->rbuf.buf; |
216 | s->internal->packet_length = data_len; | 216 | s->internal->packet_length = data_len; |
217 | memcpy(s->internal->packet, data, data_len); | 217 | memcpy(s->internal->packet, data, data_len); |
218 | ret = 1; | 218 | ret = 1; |