diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2020-03-12 17:09:03 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2020-03-12 17:09:03 +0000 |
| commit | adc27f131f95263b124f6ac3f1799700c58cee6a (patch) | |
| tree | cdf3df1a516829399e0db47b43613566f42d12aa /lib/libssl/s3_cbc.c | |
| parent | 823ce3cc01283dacc9083213bfd751006b11c88b (diff) | |
Stop overloading the record type for padding length.
Currently the CBC related code stuffs the padding length in the upper bits
of the type field... stop doing that and add a padding_length field to the
record struct instead.
ok inoguchi@ tb@
Diffstat (limited to 'lib/libssl/s3_cbc.c')
| -rw-r--r-- | lib/libssl/s3_cbc.c | 4 |
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)); } |