Commit b3f6fe91 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Updates from 1.0.0 stable branch.

parent d1417be7

ssl/ssl_lib.c

+3 −2
Original line number Diff line number Diff line
@@ -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)

		{