aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2015-01-27 15:14:12 -0500
committerRich Salz <rsalz@openssl.org>2015-01-27 15:14:12 -0500
commitdaa48704cc04c61cf8f3e74759a7a3139b6aff01 (patch)
tree049cb13eb8b74d8e2a0a1e2a89612db39f226152 /ssl/s3_pkt.c
parent474e469bbd056aebcf7e7d3207ef820f2faed4ce (diff)
downloadopenssl-daa48704cc04c61cf8f3e74759a7a3139b6aff01.tar.gz
OPENSSL_NO_XXX cleanup: NO_TLS, NO_TLS1
TLS and TLS1 are no longer optional. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/s3_pkt.c')
-rw-r--r--ssl/s3_pkt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 07adf0f25a..a8fd16c096 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1649,7 +1649,6 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
switch (rr->type) {
default:
-#ifndef OPENSSL_NO_TLS
/*
* TLS up to v1.1 just ignores unknown message types: TLS v1.2 give
* an unexpected message alert.
@@ -1658,7 +1657,6 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
rr->length = 0;
goto start;
}
-#endif
al = SSL_AD_UNEXPECTED_MESSAGE;
SSLerr(SSL_F_SSL3_READ_BYTES, SSL_R_UNEXPECTED_RECORD);
goto f_err;