aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-02-05 11:47:02 -0500
committerRich Salz <rsalz@openssl.org>2015-02-05 11:47:02 -0500
commit8dd94afb18b27edd987b471914a616f9800a5e58 (patch)
tree8b61cf9813f6543260b90f0a3cc810348415503e /ssl/s3_pkt.c
parent7e35f06ea908e47f87b723b5e951ffc55463eb8b (diff)
downloadopenssl-8dd94afb18b27edd987b471914a616f9800a5e58.tar.gz
Live code cleanup; #if 1 removal
A few minor cleanups to remove pre-processor "#if 1" stuff. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_pkt.c')
-rw-r--r--ssl/s3_pkt.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index a8fd16c096..5b8fe5c56d 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -906,11 +906,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
if ((sess == NULL) ||
(s->enc_write_ctx == NULL) ||
(EVP_MD_CTX_md(s->write_hash) == NULL)) {
-#if 1
clear = s->enc_write_ctx ? 0 : 1; /* must be AEAD cipher */
-#else
- clear = 1;
-#endif
mac_size = 0;
} else {
mac_size = EVP_MD_CTX_size(s->write_hash);