Commit 45803988 authored by Nils Larsch's avatar Nils Larsch
Browse files

make "./configure no-ssl2" work again 

PR: 1217
parent 28251e7f

ssl/s23_meth.c

+10 −2
Original line number Diff line number Diff line
@@ -63,13 +63,21 @@ 
static SSL_METHOD *ssl23_get_method(int ver);

static SSL_METHOD *ssl23_get_method(int ver)

	{

#ifndef OPENSSL_NO_SSL2

	if (ver == SSL2_VERSION)

		return(SSLv2_method());

	else if (ver == SSL3_VERSION)

	else

#endif

#ifndef OPENSSL_NO_SSL3

	if (ver == SSL3_VERSION)

		return(SSLv3_method());

	else if (ver == TLS1_VERSION)

	else

#endif

#ifndef OPENSSL_NO_TLS1

	if (ver == TLS1_VERSION)

		return(TLSv1_method());

	else

#endif

		return(NULL);

	}

ssl/ssltest.c

+6 −2
Original line number Diff line number Diff line
@@ -2241,6 +2241,7 @@ static int do_test_cipherlist(void) 
	const SSL_METHOD *meth;

	SSL_CIPHER *ci, *tci = NULL;



#ifndef OPENSSL_NO_SSL2

	fprintf(stderr, "testing SSLv2 cipher list order: ");

	meth = SSLv2_method();

	while ((ci = meth->get_cipher(i++)) != NULL)
@@ -2254,7 +2255,8 @@ static int do_test_cipherlist(void) 
		tci = ci;

		}

	fprintf(stderr, "ok\n");



#endif

#ifndef OPENSSL_NO_SSL3

	fprintf(stderr, "testing SSLv3 cipher list order: ");

	meth = SSLv3_method();

	tci = NULL;
@@ -2269,7 +2271,8 @@ static int do_test_cipherlist(void) 
		tci = ci;

		}

	fprintf(stderr, "ok\n");



#endif

#ifndef OPENSSL_NO_TLS1

	fprintf(stderr, "testing TLSv1 cipher list order: ");

	meth = TLSv1_method();

	tci = NULL;
@@ -2284,6 +2287,7 @@ static int do_test_cipherlist(void) 
		tci = ci;

		}

	fprintf(stderr, "ok\n");

#endif



	return 1;

	}