summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_cbc.c
diff options
context:
space:
mode:
authorjsing <>2020-03-12 17:01:53 +0000
committerjsing <>2020-03-12 17:01:53 +0000
commitcf38ddcaf43a2f6fd1de2405aa74feca6523733c (patch)
tree1386c6711648c45e415953677ee13b17cdc299a3 /src/lib/libssl/s3_cbc.c
parente0c848b5bda852697d7b956ff1f7b8eb68b7ad18 (diff)
downloadopenbsd-cf38ddcaf43a2f6fd1de2405aa74feca6523733c.tar.gz
openbsd-cf38ddcaf43a2f6fd1de2405aa74feca6523733c.tar.bz2
openbsd-cf38ddcaf43a2f6fd1de2405aa74feca6523733c.zip
Use internal versions of SSL3_BUFFER, SSL3_RECORD and DTLS1_RECORD_DATA.
SSL3_BUFFER, SSL3_RECORD and DTLS1_RECORD_DATA are currently still in public headers, even though their usage is internal. This moves to using _INTERNAL suffixed versions that are in internal headers, which then allows us to change them without any potential public API fallout. ok inoguchi@ tb@
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/s3_cbc.c8
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. */
115int 115int
116tls1_cbc_remove_padding(const SSL* s, SSL3_RECORD *rec, unsigned block_size, 116tls1_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
196void 196void
197ssl3_cbc_copy_mac(unsigned char* out, const SSL3_RECORD *rec, 197ssl3_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)