From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 29 Apr 2009 14:13:22 +0000 (+0000)
Subject: Updates from 1.0.0 stable branch.
X-Git-Tag: OpenSSL-fips-2_0-rc1~1699
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3f6fe919a5bedaf5e91f2e971bff270f5fe1f7d;p=oweals%2Fopenssl.git

Updates from 1.0.0 stable branch.
---

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 2ad60fe649..7b911ae1ea 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -259,7 +259,8 @@ int SSL_CTX_set_ssl_version(SSL_CTX *ctx,const SSL_METHOD *meth)
 	ctx->method=meth;
 
 	sk=ssl_create_cipher_list(ctx->method,&(ctx->cipher_list),
-		&(ctx->cipher_list_by_id),SSL_DEFAULT_CIPHER_LIST);
+		&(ctx->cipher_list_by_id),
+		meth->version == SSL2_VERSION ? "SSLv2" : SSL_DEFAULT_CIPHER_LIST);
 	if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0))
 		{
 		SSLerr(SSL_F_SSL_CTX_SET_SSL_VERSION,SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
@@ -1528,7 +1529,7 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth)
 
 	ssl_create_cipher_list(ret->method,
 		&ret->cipher_list,&ret->cipher_list_by_id,
-		SSL_DEFAULT_CIPHER_LIST);
+		meth->version == SSL2_VERSION ? "SSLv2" : SSL_DEFAULT_CIPHER_LIST);
 	if (ret->cipher_list == NULL
 	    || sk_SSL_CIPHER_num(ret->cipher_list) <= 0)
 		{