View | Details | Raw Unified | Return to bug 235506 | Differences between
and this patch

Collapse All | Expand All

(-)devel/gsoap/files/patch-gsoap_stdsoap2.c (-3 / +16 lines)
Lines 1-6 Link Here
1 
--- gsoap/stdsoap2.c.orig	2019-01-27 15:50:05 UTC
 1 
--- gsoap/stdsoap2.c.orig	2019-01-27 15:50:05 UTC
2 
+++ gsoap/stdsoap2.c
 2 
+++ gsoap/stdsoap2.c
3 
@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap)
 3 
@@ -4302,7 +4302,7 @@
4 
   ERR_clear_error();
 4 
   ERR_clear_error();
5 
   if (!soap->ctx)
 5 
   if (!soap->ctx)
6 
   {
 6 
   {
Lines 9-15 Link Here
9 
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
 9 
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
10 
     soap->ctx = SSL_CTX_new(TLS_method());
 10 
     soap->ctx = SSL_CTX_new(TLS_method());
11 
 #else
 11 
 #else
12 
@@ -4390,7 +4390,7 @@ ssl_auth_init(struct soap *soap)
 12 
@@ -4390,7 +4390,7 @@
13 
 #endif
 13 
 #endif
14 
   if ((soap->ssl_flags & SOAP_SSL_RSA))
 14 
   if ((soap->ssl_flags & SOAP_SSL_RSA))
15 
   {
 15 
   {
Lines 18-24 Link Here
18 
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
 18 
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
19 
 #endif
 19 
 #endif
20 
     {
 20 
     {
21 
@@ -6682,6 +6682,9 @@ soap_bind(struct soap *soap, const char *host, int por
 21 
@@ -4445,10 +4445,12 @@
22 
     minv = TLS1_1_VERSION;
23 
   else if ((soap->ssl_flags & SOAP_TLSv1_2))
24 
     minv = TLS1_2_VERSION;
25 
+#ifdef TLS1_3_VERSION
26 
   else if ((soap->ssl_flags & SOAP_TLSv1_3))
27 
     minv = TLS1_3_VERSION;
28 
   if ((soap->ssl_flags & SOAP_TLSv1_3) && OpenSSL_version_num() >= 0x10101000L)
29 
     maxv = TLS1_3_VERSION;
30 
+#endif
31 
   else if ((soap->ssl_flags & SOAP_TLSv1_2))
32 
     maxv = TLS1_2_VERSION;
33 
   else if ((soap->ssl_flags & SOAP_TLSv1_1))
34 
@@ -6682,6 +6684,9 @@
22 
   }
 35 
   }
23 
 #endif
 36 
 #endif
24 
 #ifdef TCP_FASTOPEN
 37 
 #ifdef TCP_FASTOPEN
(-)devel/gsoap/files/patch-gsoap_stdsoap2.cpp (-3 / +16 lines)
Lines 1-6 Link Here
1 
--- gsoap/stdsoap2.cpp.orig	2019-01-27 15:50:05 UTC
 1 
--- gsoap/stdsoap2.cpp.orig	2019-01-27 15:50:05 UTC
2 
+++ gsoap/stdsoap2.cpp
 2 
+++ gsoap/stdsoap2.cpp
3 
@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap)
 3 
@@ -4302,7 +4302,7 @@
4 
   ERR_clear_error();
 4 
   ERR_clear_error();
5 
   if (!soap->ctx)
 5 
   if (!soap->ctx)
6 
   {
 6 
   {
Lines 9-15 Link Here
9 
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
 9 
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
10 
     soap->ctx = SSL_CTX_new(TLS_method());
 10 
     soap->ctx = SSL_CTX_new(TLS_method());
11 
 #else
 11 
 #else
12 
@@ -4390,7 +4390,7 @@ ssl_auth_init(struct soap *soap)
 12 
@@ -4390,7 +4390,7 @@
13 
 #endif
 13 
 #endif
14 
   if ((soap->ssl_flags & SOAP_SSL_RSA))
 14 
   if ((soap->ssl_flags & SOAP_SSL_RSA))
15 
   {
 15 
   {
Lines 18-24 Link Here
18 
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
 18 
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
19 
 #endif
 19 
 #endif
20 
     {
 20 
     {
21 
@@ -6682,6 +6682,9 @@ soap_bind(struct soap *soap, const char *host, int por
 21 
@@ -4445,10 +4445,12 @@
22 
     minv = TLS1_1_VERSION;
23 
   else if ((soap->ssl_flags & SOAP_TLSv1_2))
24 
     minv = TLS1_2_VERSION;
25 
+#ifdef TLS1_3_VERSION
26 
   else if ((soap->ssl_flags & SOAP_TLSv1_3))
27 
     minv = TLS1_3_VERSION;
28 
   if ((soap->ssl_flags & SOAP_TLSv1_3) && OpenSSL_version_num() >= 0x10101000L)
29 
     maxv = TLS1_3_VERSION;
30 
+#endif
31 
   else if ((soap->ssl_flags & SOAP_TLSv1_2))
32 
     maxv = TLS1_2_VERSION;
33 
   else if ((soap->ssl_flags & SOAP_TLSv1_1))
34 
@@ -6682,6 +6684,9 @@
22 
   }
 35 
   }
23 
 #endif
 36 
 #endif
24 
 #ifdef TCP_FASTOPEN
 37 
 #ifdef TCP_FASTOPEN

Return to bug 235506