diff options
| author | Bodo Möller <bodo@openssl.org> | 2008-09-22 23:22:47 +0200 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2008-09-22 23:22:47 +0200 |
| commit | 837f2fc7a4a8073b269538b7d0168c0cd7edd951 (patch) | |
| tree | 348ce3ea77cb8c787c99fa7a6e35e100d6b29d9d /ssl/s3_srvr.c | |
| parent | From branch OpenSSL_0_9_8-stable: Allow soft-loading engines. (diff) | |
| download | openssl-837f2fc7a4a8073b269538b7d0168c0cd7edd951.tar.xz openssl-837f2fc7a4a8073b269538b7d0168c0cd7edd951.zip | |
Make sure that SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG can't
enable disabled ciphersuites.
Diffstat (limited to '')
| -rw-r--r-- | ssl/s3_srvr.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 8cf1e1fd82..b124a8559c 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -947,22 +947,28 @@ int ssl3_get_client_hello(SSL *s) break; } } - if (j == 0) + if (j == 0 && (s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1)) { - if ((s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG) && (sk_SSL_CIPHER_num(ciphers) == 1)) + /* Special case as client bug workaround: the previously used cipher may + * not be in the current list, the client instead might be trying to + * continue using a cipher that before wasn't chosen due to server + * preferences. We'll have to reject the connection if the cipher is not + * enabled, though. */ + c = sk_SSL_CIPHER_value(ciphers, 0); + if (sk_SSL_CIPHER_find(SSL_get_ciphers(s), c) >= 0) { - /* Very bad for multi-threading.... */ - s->session->cipher=sk_SSL_CIPHER_value(ciphers, 0); - } - else - { - /* we need to have the cipher in the cipher - * list if we are asked to reuse it */ - al=SSL_AD_ILLEGAL_PARAMETER; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_CIPHER_MISSING); - goto f_err; + s->session->cipher = c; + j = 1; } } + if (j == 0) + { + /* we need to have the cipher in the cipher + * list if we are asked to reuse it */ + al=SSL_AD_ILLEGAL_PARAMETER; + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_REQUIRED_CIPHER_MISSING); + goto f_err; + } } /* compression */ |