diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libssl/s3_cbc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_cbc.c b/src/lib/libssl/s3_cbc.c index 4b66e1f17a..371c68cfcc 100644 --- a/src/lib/libssl/s3_cbc.c +++ b/src/lib/libssl/s3_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_cbc.c,v 1.18 2020/02/21 16:07:00 jsing Exp $ */ | 1 | /* $OpenBSD: s3_cbc.c,v 1.19 2020/03/12 17:01:53 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2012 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2012 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -113,8 +113,8 @@ constant_time_eq_8(unsigned a, unsigned b) | |||
113 | * 1: if the padding was valid | 113 | * 1: if the padding was valid |
114 | * -1: otherwise. */ | 114 | * -1: otherwise. */ |
115 | int | 115 | int |
116 | tls1_cbc_remove_padding(const SSL* s, SSL3_RECORD *rec, unsigned block_size, | 116 | tls1_cbc_remove_padding(const SSL* s, SSL3_RECORD_INTERNAL *rec, |
117 | unsigned mac_size) | 117 | unsigned block_size, unsigned mac_size) |
118 | { | 118 | { |
119 | unsigned padding_length, good, to_check, i; | 119 | unsigned padding_length, good, to_check, i; |
120 | const unsigned overhead = 1 /* padding length byte */ + mac_size; | 120 | const unsigned overhead = 1 /* padding length byte */ + mac_size; |
@@ -194,7 +194,7 @@ tls1_cbc_remove_padding(const SSL* s, SSL3_RECORD *rec, unsigned block_size, | |||
194 | #define CBC_MAC_ROTATE_IN_PLACE | 194 | #define CBC_MAC_ROTATE_IN_PLACE |
195 | 195 | ||
196 | void | 196 | void |
197 | ssl3_cbc_copy_mac(unsigned char* out, const SSL3_RECORD *rec, | 197 | ssl3_cbc_copy_mac(unsigned char* out, const SSL3_RECORD_INTERNAL *rec, |
198 | unsigned md_size, unsigned orig_len) | 198 | unsigned md_size, unsigned orig_len) |
199 | { | 199 | { |
200 | #if defined(CBC_MAC_ROTATE_IN_PLACE) | 200 | #if defined(CBC_MAC_ROTATE_IN_PLACE) |