diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-11-12 01:14:12 +0000 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-11-12 01:14:12 +0000 |
| commit | 30872c28c524ad3bebf9200e79a17586c1dd7320 (patch) | |
| tree | 141435bdc06fb42eb21276903e2d38a7b42f2229 | |
| parent | a7396c031178c20ac7026a2479af9334923a5625 (diff) | |
| download | evolution-data-server-30872c28c524ad3bebf9200e79a17586c1dd7320.tar.gz | |
Disable SSLv2 compatible HELLO on SSL stream when SSLv2 is disabled
2007-11-11 Matthew Barnes <mbarnes@redhat.com>
* camel/camel-tcp-stream-ssl.c (enable_ssl):
Disable SSLv2 compatible HELLO on SSL stream when SSLv2 is
disabled (#345135, patch from Niels Vorgaard Christensen).
svn path=/branches/gnome-2-20/; revision=8193
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-tcp-stream-ssl.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 134b9bedc..4ea359b16 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2007-11-11 Matthew Barnes <mbarnes@redhat.com> + + * camel-tcp-stream-ssl.c (enable_ssl): + Disable SSLv2 compatible HELLO on SSL stream when SSLv2 is + disabled (#345135, patch from Niels Vorgaard Christensen). + 2007-09-10 Sankar P <psankar@novell.com> * camel-partition-table.c: (camel_key_table_lookup): diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c index ea27e5e53..ae22ec0e8 100644 --- a/camel/camel-tcp-stream-ssl.c +++ b/camel/camel-tcp-stream-ssl.c @@ -1041,10 +1041,13 @@ enable_ssl (CamelTcpStreamSSL *ssl, PRFileDesc *fd) return NULL; SSL_OptionSet (ssl_fd, SSL_SECURITY, PR_TRUE); - if (ssl->priv->flags & CAMEL_TCP_STREAM_SSL_ENABLE_SSL2) + if (ssl->priv->flags & CAMEL_TCP_STREAM_SSL_ENABLE_SSL2) { SSL_OptionSet (ssl_fd, SSL_ENABLE_SSL2, PR_TRUE); - else + SSL_OptionSet (ssl_fd, SSL_V2_COMPATIBLE_HELLO, PR_TRUE); + } else { SSL_OptionSet (ssl_fd, SSL_ENABLE_SSL2, PR_FALSE); + SSL_OptionSet (ssl_fd, SSL_V2_COMPATIBLE_HELLO, PR_FALSE); + } if (ssl->priv->flags & CAMEL_TCP_STREAM_SSL_ENABLE_SSL3) SSL_OptionSet (ssl_fd, SSL_ENABLE_SSL3, PR_TRUE); else |