diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-29 14:13:22 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-29 14:13:22 +0000 |
| commit | b3f6fe919a5bedaf5e91f2e971bff270f5fe1f7d (patch) | |
| tree | 609f7ab966ff8b1cc1e405319a5acd5b208bc31b /ssl | |
| parent | d1417be75cdf92306d9e494fd2937c4210cb0335 (diff) | |
Updates from 1.0.0 stable branch.
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |