diff options
author | bcook <> | 2019-05-13 22:48:30 +0000 |
---|---|---|
committer | bcook <> | 2019-05-13 22:48:30 +0000 |
commit | a3d0d38491040ac80d200d52e9800c9d213457c2 (patch) | |
tree | 556bee1561383613b567302252534de1f56b6143 /src | |
parent | 2e7ff92c365b42b38bc2d8d2b9718623d720203a (diff) | |
download | openbsd-a3d0d38491040ac80d200d52e9800c9d213457c2.tar.gz openbsd-a3d0d38491040ac80d200d52e9800c9d213457c2.tar.bz2 openbsd-a3d0d38491040ac80d200d52e9800c9d213457c2.zip |
Remove unused pad check, which is handled by tls1_cbc_remove_padding() now.
Fixes COV-174858
ok tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/t1_enc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_enc.c b/src/lib/libssl/t1_enc.c index 79a5bdd2b3..1eaa087383 100644 --- a/src/lib/libssl/t1_enc.c +++ b/src/lib/libssl/t1_enc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_enc.c,v 1.117 2019/02/09 15:26:15 jsing Exp $ */ | 1 | /* $OpenBSD: t1_enc.c,v 1.118 2019/05/13 22:48:30 bcook Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -671,7 +671,7 @@ tls1_enc(SSL *s, int send) | |||
671 | SSL3_RECORD *rec; | 671 | SSL3_RECORD *rec; |
672 | unsigned char *seq; | 672 | unsigned char *seq; |
673 | unsigned long l; | 673 | unsigned long l; |
674 | int bs, i, j, k, pad = 0, ret, mac_size = 0; | 674 | int bs, i, j, k, ret, mac_size = 0; |
675 | 675 | ||
676 | if (send) { | 676 | if (send) { |
677 | aead = s->internal->aead_write_ctx; | 677 | aead = s->internal->aead_write_ctx; |
@@ -904,8 +904,6 @@ tls1_enc(SSL *s, int send) | |||
904 | mac_size = EVP_MD_CTX_size(s->read_hash); | 904 | mac_size = EVP_MD_CTX_size(s->read_hash); |
905 | if ((bs != 1) && !send) | 905 | if ((bs != 1) && !send) |
906 | ret = tls1_cbc_remove_padding(s, rec, bs, mac_size); | 906 | ret = tls1_cbc_remove_padding(s, rec, bs, mac_size); |
907 | if (pad && !send) | ||
908 | rec->length -= pad; | ||
909 | } | 907 | } |
910 | return ret; | 908 | return ret; |
911 | } | 909 | } |