summaryrefslogtreecommitdiff
path: root/lib/libssl/s3_cbc.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libssl/s3_cbc.c')
-rw-r--r--lib/libssl/s3_cbc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/s3_cbc.c b/lib/libssl/s3_cbc.c
index 371c68cfcc3..8ae87d73030 100644
--- a/lib/libssl/s3_cbc.c
+++ b/lib/libssl/s3_cbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_cbc.c,v 1.19 2020/03/12 17:01:53 jsing Exp $ */
+/* $OpenBSD: s3_cbc.c,v 1.20 2020/03/12 17:09:02 jsing Exp $ */
/* ====================================================================
* Copyright (c) 2012 The OpenSSL Project. All rights reserved.
*
@@ -169,7 +169,7 @@ tls1_cbc_remove_padding(const SSL* s, SSL3_RECORD_INTERNAL *rec,
padding_length = good & (padding_length + 1);
rec->length -= padding_length;
- rec->type |= padding_length<<8; /* kludge: pass padding length */
+ rec->padding_length = padding_length;
return (int)((good & 1) | (~good & -1));
}