diff options
| author |   jsing <jsing@openbsd.org> | 2018-09-08 14:39:41 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-09-08 14:39:41 +0000 |
| commit | ccfc0b04c0bee73b50fdfb0d219e172f018de475 (patch) | |
| tree | cb21fc0e3071629492577b0f618cd7ad8a07d609 /lib/libssl/s3_cbc.c | |
| parent | SSL_MAX_DIGEST is no longer needed. (diff) | |
| download | wireguard-openbsd-ccfc0b04c0bee73b50fdfb0d219e172f018de475.tar.xz wireguard-openbsd-ccfc0b04c0bee73b50fdfb0d219e172f018de475.zip | |
Remove now unused code for EVP_CIPH_FLAG_AEAD_CIPHER and EVP_CIPH_GCM_MODE.
ok inoguchi@ tb@
Diffstat (limited to 'lib/libssl/s3_cbc.c')
| -rw-r--r-- | lib/libssl/s3_cbc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libssl/s3_cbc.c b/lib/libssl/s3_cbc.c index 8c910c5f86b..a1c0ce6b908 100644 --- a/lib/libssl/s3_cbc.c +++ b/lib/libssl/s3_cbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_cbc.c,v 1.16 2017/01/23 08:08:06 beck Exp $ */ +/* $OpenBSD: s3_cbc.c,v 1.17 2018/09/08 14:39:41 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2012 The OpenSSL Project. All rights reserved. * @@ -135,12 +135,6 @@ tls1_cbc_remove_padding(const SSL* s, SSL3_RECORD *rec, unsigned block_size, padding_length = rec->data[rec->length - 1]; - if (EVP_CIPHER_flags(s->enc_read_ctx->cipher) & EVP_CIPH_FLAG_AEAD_CIPHER) { - /* padding is already verified */ - rec->length -= padding_length + 1; - return 1; - } - good = constant_time_ge(rec->length, overhead + padding_length); /* The padding consists of a length byte at the end of the record and * then that many bytes of padding, all with the same value as the |