From a3d0d38491040ac80d200d52e9800c9d213457c2 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Mon, 13 May 2019 22:48:30 +0000
Subject: Remove unused pad check, which is handled by
 tls1_cbc_remove_padding() now.

Fixes COV-174858

ok tb@
---
 src/lib/libssl/t1_enc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

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 @@
-/* $OpenBSD: t1_enc.c,v 1.117 2019/02/09 15:26:15 jsing Exp $ */
+/* $OpenBSD: t1_enc.c,v 1.118 2019/05/13 22:48:30 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -671,7 +671,7 @@ tls1_enc(SSL *s, int send)
 	SSL3_RECORD *rec;
 	unsigned char *seq;
 	unsigned long l;
-	int bs, i, j, k, pad = 0, ret, mac_size = 0;
+	int bs, i, j, k, ret, mac_size = 0;
 
 	if (send) {
 		aead = s->internal->aead_write_ctx;
@@ -904,8 +904,6 @@ tls1_enc(SSL *s, int send)
 			mac_size = EVP_MD_CTX_size(s->read_hash);
 		if ((bs != 1) && !send)
 			ret = tls1_cbc_remove_padding(s, rec, bs, mac_size);
-		if (pad && !send)
-			rec->length -= pad;
 	}
 	return ret;
 }
-- 
cgit v1.2.3-55-g6feb