diff options
author | jsing <> | 2022-11-10 18:06:37 +0000 |
---|---|---|
committer | jsing <> | 2022-11-10 18:06:37 +0000 |
commit | 3fbacf810de490214fc4dba0b34a532906eadfac (patch) | |
tree | 1c172cf5ae25ab26fa6f64cb114505e1bfcc1267 /src/lib/libssl/ssl_locl.h | |
parent | 67d2b90781cde981c11f7630740bca9847e85165 (diff) | |
download | openbsd-3fbacf810de490214fc4dba0b34a532906eadfac.tar.gz openbsd-3fbacf810de490214fc4dba0b34a532906eadfac.tar.bz2 openbsd-3fbacf810de490214fc4dba0b34a532906eadfac.zip |
Use tls_buffer for alert and handshake fragments in the legacy stack.
This avoids a bunch of pointer munging and a handrolled memmove.
ok tb@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 64cf6a60f9..69546c0962 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.430 2022/11/07 11:58:45 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.431 2022/11/10 18:06:37 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1168,12 +1168,9 @@ typedef struct ssl3_state_st { | |||
1168 | 1168 | ||
1169 | SSL3_RECORD_INTERNAL rrec; /* each decoded record goes in here */ | 1169 | SSL3_RECORD_INTERNAL rrec; /* each decoded record goes in here */ |
1170 | 1170 | ||
1171 | /* storage for Alert/Handshake protocol data received but not | 1171 | /* Unprocessed Alert/Handshake protocol data. */ |
1172 | * yet processed by ssl3_read_bytes: */ | 1172 | struct tls_buffer *alert_fragment; |
1173 | unsigned char alert_fragment[2]; | 1173 | struct tls_buffer *handshake_fragment; |
1174 | unsigned int alert_fragment_len; | ||
1175 | unsigned char handshake_fragment[4]; | ||
1176 | unsigned int handshake_fragment_len; | ||
1177 | 1174 | ||
1178 | /* partial write - check the numbers match */ | 1175 | /* partial write - check the numbers match */ |
1179 | unsigned int wnum; /* number of bytes sent so far */ | 1176 | unsigned int wnum; /* number of bytes sent so far */ |