[evolution-data-server/f20] Update the POODLE patch (missed one chunk)
Milan Crha
mcrha at fedoraproject.org
Thu Oct 16 15:24:35 UTC 2014
commit a08d799d9824ea5003e4d921e22f459c829f7c7b
Author: Milan Crha <mcrha at redhat.com>
Date: Thu Oct 16 17:24:07 2014 +0200
Update the POODLE patch (missed one chunk)
...a-server-3.10.4-poodle-enable-tls-for-ssl.patch | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/evolution-data-server-3.10.4-poodle-enable-tls-for-ssl.patch b/evolution-data-server-3.10.4-poodle-enable-tls-for-ssl.patch
index 79a4f97..f99bd3d 100644
--- a/evolution-data-server-3.10.4-poodle-enable-tls-for-ssl.patch
+++ b/evolution-data-server-3.10.4-poodle-enable-tls-for-ssl.patch
@@ -1,6 +1,19 @@
+diff -up evolution-data-server-3.10.4/camel/camel-network-service.c.poodle-enable-tls-for-ssl evolution-data-server-3.10.4/camel/camel-network-service.c
+--- evolution-data-server-3.10.4/camel/camel-network-service.c.poodle-enable-tls-for-ssl 2014-10-16 17:23:12.445495018 +0200
++++ evolution-data-server-3.10.4/camel/camel-network-service.c 2014-10-16 17:23:17.187494840 +0200
+@@ -328,7 +328,8 @@ network_service_connect_sync (CamelNetwo
+ stream = camel_tcp_stream_ssl_new (
+ session, host,
+ CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 |
+- CAMEL_TCP_STREAM_SSL_ENABLE_SSL3);
++ CAMEL_TCP_STREAM_SSL_ENABLE_SSL3 |
++ CAMEL_TCP_STREAM_SSL_ENABLE_TLS);
+ break;
+
+ default:
diff -up evolution-data-server-3.10.4/camel/camel-tcp-stream-ssl.c.poodle-enable-tls-for-ssl evolution-data-server-3.10.4/camel/camel-tcp-stream-ssl.c
--- evolution-data-server-3.10.4/camel/camel-tcp-stream-ssl.c.poodle-enable-tls-for-ssl 2013-12-08 19:42:50.000000000 +0100
-+++ evolution-data-server-3.10.4/camel/camel-tcp-stream-ssl.c 2014-10-16 17:11:27.980521481 +0200
++++ evolution-data-server-3.10.4/camel/camel-tcp-stream-ssl.c 2014-10-16 17:14:29.590514659 +0200
@@ -43,6 +43,8 @@
#include <sslerr.h>
#include "nss.h" /* Don't use <> here or it will include the system nss.h instead */
@@ -60,7 +73,7 @@ diff -up evolution-data-server-3.10.4/camel/camel-tcp-stream-ssl.c.poodle-enable
/* NSS provides a default implementation for the SSL_GetClientAuthDataHook callback
diff -up evolution-data-server-3.10.4/camel/camel.c.poodle-enable-tls-for-ssl evolution-data-server-3.10.4/camel/camel.c
--- evolution-data-server-3.10.4/camel/camel.c.poodle-enable-tls-for-ssl 2013-12-08 19:42:49.000000000 +0100
-+++ evolution-data-server-3.10.4/camel/camel.c 2014-10-16 17:11:27.980521481 +0200
++++ evolution-data-server-3.10.4/camel/camel.c 2014-10-16 17:14:29.590514659 +0200
@@ -100,6 +100,9 @@ camel_init (const gchar *configdir,
gchar *nss_configdir = NULL;
gchar *nss_sql_configdir = NULL;
More information about the scm-commits
mailing list