A modern TLS library without full support for TLS does not make sense. Change-Id: I032537d1412f6e4effc9a2dd47123baf0084b4c6 Reviewed-on: https://boringssl-review.googlesource.com/1382 Reviewed-by: Adam Langley <agl@google.com>kris/onging/CECPQ3_patch15
@@ -1216,14 +1216,12 @@ start: | |||||
switch (rr->type) | switch (rr->type) | ||||
{ | { | ||||
default: | default: | ||||
#ifndef OPENSSL_NO_TLS | |||||
/* TLS just ignores unknown message types */ | /* TLS just ignores unknown message types */ | ||||
if (s->version == TLS1_VERSION) | if (s->version == TLS1_VERSION) | ||||
{ | { | ||||
rr->length = 0; | rr->length = 0; | ||||
goto start; | goto start; | ||||
} | } | ||||
#endif | |||||
al=SSL_AD_UNEXPECTED_MESSAGE; | al=SSL_AD_UNEXPECTED_MESSAGE; | ||||
OPENSSL_PUT_ERROR(SSL, dtls1_read_bytes, SSL_R_UNEXPECTED_RECORD); | OPENSSL_PUT_ERROR(SSL, dtls1_read_bytes, SSL_R_UNEXPECTED_RECORD); | ||||
goto f_err; | goto f_err; | ||||
@@ -70,7 +70,6 @@ static const SSL_METHOD *ssl23_get_method(int ver) | |||||
return(SSLv3_method()); | return(SSLv3_method()); | ||||
else | else | ||||
#endif | #endif | ||||
#ifndef OPENSSL_NO_TLS1 | |||||
if (ver == TLS1_VERSION) | if (ver == TLS1_VERSION) | ||||
return(TLSv1_method()); | return(TLSv1_method()); | ||||
else if (ver == TLS1_1_VERSION) | else if (ver == TLS1_1_VERSION) | ||||
@@ -78,7 +77,6 @@ static const SSL_METHOD *ssl23_get_method(int ver) | |||||
else if (ver == TLS1_2_VERSION) | else if (ver == TLS1_2_VERSION) | ||||
return(TLSv1_2_method()); | return(TLSv1_2_method()); | ||||
else | else | ||||
#endif | |||||
return(NULL); | return(NULL); | ||||
} | } | ||||
@@ -1367,7 +1367,6 @@ start: | |||||
switch (rr->type) | switch (rr->type) | ||||
{ | { | ||||
default: | default: | ||||
#ifndef OPENSSL_NO_TLS | |||||
/* TLS up to v1.1 just ignores unknown message types: | /* TLS up to v1.1 just ignores unknown message types: | ||||
* TLS v1.2 give an unexpected message alert. | * TLS v1.2 give an unexpected message alert. | ||||
*/ | */ | ||||
@@ -1376,7 +1375,6 @@ start: | |||||
rr->length = 0; | rr->length = 0; | ||||
goto start; | goto start; | ||||
} | } | ||||
#endif | |||||
al=SSL_AD_UNEXPECTED_MESSAGE; | al=SSL_AD_UNEXPECTED_MESSAGE; | ||||
OPENSSL_PUT_ERROR(SSL, ssl3_read_bytes, SSL_R_UNEXPECTED_RECORD); | OPENSSL_PUT_ERROR(SSL, ssl3_read_bytes, SSL_R_UNEXPECTED_RECORD); | ||||
goto f_err; | goto f_err; | ||||