Attachment #227592 for bug #258182

View | Details | Raw Unified | Return to bug 258182 | Differences between
Collapse All | Expand All




--- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig	2019-02-10 15:19:37 UTC
+++ gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
   ERR_clear_error();
   if (!soap->ctx)
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
     soap->ctx = SSL_CTX_new(TLS_method());
 #else
@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
 #endif
   if ((soap->ssl_flags & SOAP_SSL_RSA))
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
     {
       unsigned long e = RSA_F4;




--- gsoap/plugin/mecevp.c.orig	2019-01-27 15:50:03 UTC
+++ gsoap/plugin/mecevp.c
@@ -336,7 +336,7 @@ soap_mec_init(struct soap *soap, struct soap_mec_data 
   int ok = 1;
   DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_mec_init()\n"));
   soap_ssl_init();
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
   data->ctx = (EVP_CIPHER_CTX*)SOAP_MALLOC(soap, sizeof(EVP_CIPHER_CTX));
   if (data->ctx)
     EVP_CIPHER_CTX_init(data->ctx);
@@ -500,7 +500,7 @@ soap_mec_cleanup(struct soap *soap, struct soap_mec_da
   data->type = NULL;
   if (data->ctx)
   {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     EVP_CIPHER_CTX_cleanup(data->ctx);
     SOAP_FREE(soap, data->ctx);
 #else




--- gsoap/plugin/smdevp.c.orig	2018-07-22 18:18:22 UTC
+++ gsoap/plugin/smdevp.c
@@ -480,7 +480,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data 
   /* allocate and init the OpenSSL HMAC or EVP_MD context */
   if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
   {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX));
     if (data->ctx)
       HMAC_CTX_init((HMAC_CTX*)data->ctx);
@@ -490,7 +490,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data 
   }
   else
   {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX));
     if (data->ctx)
       EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx);
@@ -510,7 +510,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data 
     case SOAP_SMD_SHA1:
       type = EVP_sha1();
       break;
-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL || defined(LIBRESSL_VERSION_NUMBER))
     case SOAP_SMD_SHA224:
       type = EVP_sha224();
       break;
@@ -662,7 +662,7 @@ soap_smd_cleanup(struct soap *soap, struct soap_smd_da
   (void)soap;
   if (data->ctx)
   {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
     if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
       HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
     else
@@ -706,7 +706,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data
     }
     if (data->ctx)
     {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
       if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
         HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
       else




--- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig	2019-02-10 15:19:36 UTC
+++ gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
   ERR_clear_error();
   if (!soap->ctx)
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
     soap->ctx = SSL_CTX_new(TLS_method());
 #else
@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
 #endif
   if ((soap->ssl_flags & SOAP_SSL_RSA))
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
     {
       unsigned long e = RSA_F4;




--- gsoap/stdsoap2.c.orig	2019-02-10 15:19:37 UTC
+++ gsoap/stdsoap2.c
@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
   ERR_clear_error();
   if (!soap->ctx)
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
     soap->ctx = SSL_CTX_new(TLS_method());
 #else
@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
 #endif
   if ((soap->ssl_flags & SOAP_SSL_RSA))
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
     {
       unsigned long e = RSA_F4;
@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap)
     minv = TLS1_1_VERSION;
   else if ((soap->ssl_flags & SOAP_TLSv1_2))




--- gsoap/stdsoap2.cpp.orig	2019-02-10 15:19:37 UTC
+++ gsoap/stdsoap2.cpp
@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
   ERR_clear_error();
   if (!soap->ctx)
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
     /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */
     soap->ctx = SSL_CTX_new(TLS_method());
 #else
@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
 #endif
   if ((soap->ssl_flags & SOAP_SSL_RSA))
   {
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
     if (SSL_CTX_need_tmp_RSA(soap->ctx))
     {
       unsigned long e = RSA_F4;
@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap)
     minv = TLS1_1_VERSION;
   else if ((soap->ssl_flags & SOAP_TLSv1_2))
- 

Return to bug 258182

Removed Link Here

(-)a/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp (-20 lines)
1	--- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig 2019-02-10 15:19:37 UTC
2	+++ gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp
3	@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
4	ERR_clear_error();
5	if (!soap->ctx)
6	{
7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
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());
11	#else
12	@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
13	#endif
14	if ((soap->ssl_flags & SOAP_SSL_RSA))
15	{
16	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
17	+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
18	if (SSL_CTX_need_tmp_RSA(soap->ctx))
19	{
20	unsigned long e = RSA_F4;

Removed Link Here

(-)a/devel/gsoap/files/patch-gsoap_plugin_mecevp.c (-20 lines)
1	--- gsoap/plugin/mecevp.c.orig 2019-01-27 15:50:03 UTC
2	+++ gsoap/plugin/mecevp.c
3	@@ -336,7 +336,7 @@ soap_mec_init(struct soap *soap, struct soap_mec_data
4	int ok = 1;
5	DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_mec_init()\n"));
6	soap_ssl_init();
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
9	data->ctx = (EVP_CIPHER_CTX*)SOAP_MALLOC(soap, sizeof(EVP_CIPHER_CTX));
10	if (data->ctx)
11	EVP_CIPHER_CTX_init(data->ctx);
12	@@ -500,7 +500,7 @@ soap_mec_cleanup(struct soap *soap, struct soap_mec_da
13	data->type = NULL;
14	if (data->ctx)
15	{
16	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
18	EVP_CIPHER_CTX_cleanup(data->ctx);
19	SOAP_FREE(soap, data->ctx);
20	#else

Removed Link Here

(-)a/devel/gsoap/files/patch-gsoap_plugin_smdevp.c (-47 lines)
1	--- gsoap/plugin/smdevp.c.orig 2018-07-22 18:18:22 UTC
2	+++ gsoap/plugin/smdevp.c
3	@@ -480,7 +480,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data
4	/* allocate and init the OpenSSL HMAC or EVP_MD context */
5	if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
6	{
7	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
8	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
9	data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX));
10	if (data->ctx)
11	HMAC_CTX_init((HMAC_CTX*)data->ctx);
12	@@ -490,7 +490,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data
13	}
14	else
15	{
16	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
17	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
18	data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX));
19	if (data->ctx)
20	EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx);
21	@@ -510,7 +510,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data
22	case SOAP_SMD_SHA1:
23	type = EVP_sha1();
24	break;
25	-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL)
26	+#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL \|\| defined(LIBRESSL_VERSION_NUMBER))
27	case SOAP_SMD_SHA224:
28	type = EVP_sha224();
29	break;
30	@@ -662,7 +662,7 @@ soap_smd_cleanup(struct soap *soap, struct soap_smd_da
31	(void)soap;
32	if (data->ctx)
33	{
34	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
35	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
36	if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
37	HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
38	else
39	@@ -706,7 +706,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data
40	}
41	if (data->ctx)
42	{
43	-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
44	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L \|\| defined(LIBRESSL_VERSION_NUMBER))
45	if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC)
46	HMAC_CTX_cleanup((HMAC_CTX*)data->ctx);
47	else

Removed Link Here

(-)a/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp (-20 lines)
1	--- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig 2019-02-10 15:19:36 UTC
2	+++ gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp
3	@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
4	ERR_clear_error();
5	if (!soap->ctx)
6	{
7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
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());
11	#else
12	@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
13	#endif
14	if ((soap->ssl_flags & SOAP_SSL_RSA))
15	{
16	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
17	+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
18	if (SSL_CTX_need_tmp_RSA(soap->ctx))
19	{
20	unsigned long e = RSA_F4;

Lines 1-23 Link Here

(-)b/devel/gsoap/files/patch-gsoap_stdsoap2.c (-18 lines)
1	--- gsoap/stdsoap2.c.orig 2019-02-10 15:19:37 UTC	1	--- gsoap/stdsoap2.c.orig 2019-02-10 15:19:37 UTC
2	+++ gsoap/stdsoap2.c	2	+++ gsoap/stdsoap2.c
3	@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
4	ERR_clear_error();
5	if (!soap->ctx)
6	{
7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
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());
11	#else
12	@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
13	#endif
14	if ((soap->ssl_flags & SOAP_SSL_RSA))
15	{
16	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
17	+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
18	if (SSL_CTX_need_tmp_RSA(soap->ctx))
19	{
20	unsigned long e = RSA_F4;
21	@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap)	3	@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap)
22	minv = TLS1_1_VERSION;	4	minv = TLS1_1_VERSION;
23	else if ((soap->ssl_flags & SOAP_TLSv1_2))	5	else if ((soap->ssl_flags & SOAP_TLSv1_2))

Lines 1-23 Link Here

(-)b/devel/gsoap/files/patch-gsoap_stdsoap2.cpp (-19 lines)
1	--- gsoap/stdsoap2.cpp.orig 2019-02-10 15:19:37 UTC	1	--- gsoap/stdsoap2.cpp.orig 2019-02-10 15:19:37 UTC
2	+++ gsoap/stdsoap2.cpp	2	+++ gsoap/stdsoap2.cpp
3	@@ -4306,7 +4306,7 @@ ssl_auth_init(struct soap *soap)
4	ERR_clear_error();
5	if (!soap->ctx)
6	{
7	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
8	+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER))
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());
11	#else
12	@@ -4394,7 +4394,7 @@ ssl_auth_init(struct soap *soap)
13	#endif
14	if ((soap->ssl_flags & SOAP_SSL_RSA))
15	{
16	-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
17	+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER))
18	if (SSL_CTX_need_tmp_RSA(soap->ctx))
19	{
20	unsigned long e = RSA_F4;
21	@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap)	3	@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap)
22	minv = TLS1_1_VERSION;	4	minv = TLS1_1_VERSION;
23	else if ((soap->ssl_flags & SOAP_TLSv1_2))	5	else if ((soap->ssl_flags & SOAP_TLSv1_2))
24	-