diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-12-02 22:36:51 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2010-12-02 22:36:51 +0000 |
| commit | fd3744ddb062b70bb370acec340acbac23f0bd98 (patch) | |
| tree | b5613f06a47ca8522264b520b04a27a5fa0ff300 /ssl/s3_clnt.c | |
| parent | f2c43d19b91f8847c1dfd87721254b44f963d9a2 (diff) | |
| download | src-fd3744ddb062b70bb370acec340acbac23f0bd98.tar.gz src-fd3744ddb062b70bb370acec340acbac23f0bd98.zip | |
Import OpenSSL 0.9.8q.vendor/openssl/0.9.8q
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=216135
svn path=/vendor-crypto/openssl/0.9.8q/; revision=216136; tag=vendor/openssl/0.9.8q
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index f0995b96acea..a7cb7a1ebf30 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -814,8 +814,11 @@ int ssl3_get_server_hello(SSL *s) s->session->cipher_id = s->session->cipher->id; if (s->hit && (s->session->cipher_id != c->id)) { +/* Workaround is now obsolete */ +#if 0 if (!(s->options & SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG)) +#endif { al=SSL_AD_ILLEGAL_PARAMETER; SSLerr(SSL_F_SSL3_GET_SERVER_HELLO,SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED); |