Commit daa48704 authored Jan 27, 2015 by Rich Salz

OPENSSL_NO_XXX cleanup: NO_TLS, NO_TLS1



TLS and TLS1 are no longer optional.

Reviewed-by: Richard Levitte <levitte@openssl.org>

parent 474e469b

apps/ciphers.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -129,10 +129,8 @@ int MAIN(int argc, char **argv)
		else if (strcmp(*argv, "-ssl3") == 0)
		meth = SSLv3_client_method();
		#endif
		#ifndef OPENSSL_NO_TLS1
		else if (strcmp(*argv, "-tls1") == 0)
		meth = TLSv1_client_method();
		#endif
		else if ((strncmp(argv, "-h", 2) == 0) \|\| (strcmp(argv, "-?") == 0)) {
		badops = 1;
		break;

apps/s_client.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -931,14 +931,12 @@ int MAIN(int argc, char **argv)
		else if (strcmp(*argv, "-ssl3") == 0)
		meth = SSLv3_client_method();
		#endif
		#ifndef OPENSSL_NO_TLS1
		else if (strcmp(*argv, "-tls1_2") == 0)
		meth = TLSv1_2_client_method();
		else if (strcmp(*argv, "-tls1_1") == 0)
		meth = TLSv1_1_client_method();
		else if (strcmp(*argv, "-tls1") == 0)
		meth = TLSv1_client_method();
		#endif
		#ifndef OPENSSL_NO_DTLS1
		else if (strcmp(*argv, "-dtls") == 0) {
		meth = DTLS_client_method();

apps/s_server.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1404,7 +1404,6 @@ int MAIN(int argc, char *argv[])
		meth = SSLv3_server_method();
		}
		#endif
		#ifndef OPENSSL_NO_TLS1
		else if (strcmp(*argv, "-tls1") == 0) {
		meth = TLSv1_server_method();
		} else if (strcmp(*argv, "-tls1_1") == 0) {
		@@ -1412,7 +1411,6 @@ int MAIN(int argc, char *argv[])
		} else if (strcmp(*argv, "-tls1_2") == 0) {
		meth = TLSv1_2_server_method();
		}
		#endif
		#ifndef OPENSSL_NO_DTLS1
		else if (strcmp(*argv, "-dtls") == 0) {
		meth = DTLS_server_method();

ssl/d1_pkt.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -1343,13 +1343,11 @@ int dtls1_read_bytes(SSL s, int type, unsigned char buf, int len, int peek)

		switch (rr->type) {
		default:
		#ifndef OPENSSL_NO_TLS
		/* TLS just ignores unknown message types */
		if (s->version == TLS1_VERSION) {
		rr->length = 0;
		goto start;
		}
		#endif
		al = SSL_AD_UNEXPECTED_MESSAGE;
		SSLerr(SSL_F_DTLS1_READ_BYTES, SSL_R_UNEXPECTED_RECORD);
		goto f_err;

ssl/s23_meth.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ static const SSL_METHOD *ssl23_get_method(int ver)
		return (SSLv3_method());
		else
		#endif
		#ifndef OPENSSL_NO_TLS1
		if (ver == TLS1_VERSION)
		return (TLSv1_method());
		else if (ver == TLS1_1_VERSION)
		@@ -76,7 +75,6 @@ static const SSL_METHOD *ssl23_get_method(int ver)
		else if (ver == TLS1_2_VERSION)
		return (TLSv1_2_method());
		else
		#endif
		return (NULL);
		}