Attachment #212262 for bug #244682

Lines 2-9 Link Here

(-)b/devel/qca/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qca	4	PORTNAME= qca
5	PORTVERSION= 2.2.1	5	DISTVERSION= 2.3.0
6	PORTREVISION= 4
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= KDE/stable/qca/${PORTVERSION}	7	MASTER_SITES= KDE/stable/qca/${PORTVERSION}
9	PKGNAMESUFFIX= -qt5	8	PKGNAMESUFFIX= -qt5

Lines 1-3 Link Here

(-)b/devel/qca/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1556314674	1	TIMESTAMP = 1583676075
2	SHA256 (qca-2.2.1.tar.xz) = d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02	2	SHA256 (qca-2.3.0.tar.xz) = 1d68ef41a1b61dc9786beb923a68902a6276a77cced5e5ea7ff985ef113932d7
3	SIZE (qca-2.2.1.tar.xz) = 691676	3	SIZE (qca-2.3.0.tar.xz) = 729504

Removed Link Here

(-)a/devel/qca/files/patch-plugins_qca-botan_CMakeLists.txt (-10 lines)
1	--- plugins/qca-botan/CMakeLists.txt.orig 2019-04-24 12:58:14 UTC
2	+++ plugins/qca-botan/CMakeLists.txt
3	@@ -16,6 +16,7 @@ if(BOTAN_FOUND)
4	set_property(TARGET qca-botan PROPERTY SUFFIX ".dylib")
5	endif()
6
7	+ target_link_directories(qca-botan PRIVATE ${BOTAN_LIBRARY_DIRS})
8	target_link_libraries(qca-botan ${QT_QTCORE_LIBRARY} ${QCA_LIB_NAME} ${BOTAN_LIBRARIES})
9
10	if(NOT DEVELOPER_MODE)




--- plugins/qca-ossl/ossl110-compat.h.orig	2019-04-24 12:58:14 UTC
+++ plugins/qca-ossl/ossl110-compat.h
@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
     return 1;
 }
 
-static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
-    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
-{
-    if (!meth) return 0;
-    meth->rsa_sign = sign;
-    return 1;
-}
-
-static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
-    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
-{
-    if (!meth) return 0;
-    meth->rsa_verify = verify;
-    return 1;
-}
-
 static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
 {
     if (!meth) return 0;
@@ -271,5 +255,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
 #define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
 
 #endif // OPENSSL_VERSION_NUMBER < 0x10100000L
+
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+static int RSA_meth_set_sign(RSA_METHOD *meth, int (*sign) (int type, const unsigned char *m,
+    unsigned int m_length, unsigned char *sigret, unsigned int *siglen, const RSA *rsa))
+{
+    if (!meth) return 0;
+    meth->rsa_sign = sign;
+    return 1;
+}
+
+static int RSA_meth_set_verify(RSA_METHOD *meth, int (*verify) (int dtype, const unsigned char *m,
+    unsigned int m_length, const unsigned char *sigbuf, unsigned int siglen, const RSA *rsa))
+{
+    if (!meth) return 0;
+    meth->rsa_verify = verify;
+    return 1;
+}
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
 
 #endif // OSSL110COMPAT_H




--- plugins/qca-ossl/qca-ossl.cpp.orig	2019-04-24 12:58:14 UTC
+++ plugins/qca-ossl/qca-ossl.cpp
@@ -62,12 +62,12 @@
 #endif
 
 // OpenSSL 1.1.0 compatibility macros
-#ifdef OSSL_110
+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
 #define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
 #define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
 #endif
 
-#ifdef OSSL_110
+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
 #include <openssl/kdf.h>
 #endif
 
@@ -1280,7 +1280,7 @@ class opensslPbkdf2Context : public KDFContext (public
 protected:
 };
 
-#ifdef OSSL_110
+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
 class opensslHkdfContext : public HKDFContext
 {
 public:
@@ -7416,7 +7416,7 @@ class opensslProvider : public Provider (public)
 #endif
 		list += "pbkdf1(sha1)";
 		list += "pbkdf2(sha1)";
-#ifdef OSSL_110
+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
 		list += "hkdf(sha256)";
 #endif
 		list += "pkey";
@@ -7489,7 +7489,7 @@ class opensslProvider : public Provider (public)
 #endif
 		else if ( type == "pbkdf2(sha1)" )
 			return new opensslPbkdf2Context( this, type );
-#ifdef OSSL_110
+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
 		else if ( type == "hkdf(sha256)" )
 			return new opensslHkdfContext( this, type );
 #endif

Return to bug 244682

Removed Link Here

(-)a/devel/qca/files/patch-plugins_qca-ossl_ossl110-compat.h (-49 lines)
1	--- plugins/qca-ossl/ossl110-compat.h.orig 2019-04-24 12:58:14 UTC
2	+++ plugins/qca-ossl/ossl110-compat.h
3	@@ -205,22 +205,6 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int
4	return 1;
5	}
6
7	-static int RSA_meth_set_sign(RSA_METHOD meth, int (sign) (int type, const unsigned char *m,
8	- unsigned int m_length, unsigned char sigret, unsigned int siglen, const RSA *rsa))
9	-{
10	- if (!meth) return 0;
11	- meth->rsa_sign = sign;
12	- return 1;
13	-}
14	-
15	-static int RSA_meth_set_verify(RSA_METHOD meth, int (verify) (int dtype, const unsigned char *m,
16	- unsigned int m_length, const unsigned char sigbuf, unsigned int siglen, const RSA rsa))
17	-{
18	- if (!meth) return 0;
19	- meth->rsa_verify = verify;
20	- return 1;
21	-}
22	-
23	static int RSA_meth_set_finish(RSA_METHOD meth, int (finish) (RSA *rsa))
24	{
25	if (!meth) return 0;
26	@@ -271,5 +255,23 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
27	#define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
28
29	#endif // OPENSSL_VERSION_NUMBER < 0x10100000L
30	+
31	+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
32	+static int RSA_meth_set_sign(RSA_METHOD meth, int (sign) (int type, const unsigned char *m,
33	+ unsigned int m_length, unsigned char sigret, unsigned int siglen, const RSA *rsa))
34	+{
35	+ if (!meth) return 0;
36	+ meth->rsa_sign = sign;
37	+ return 1;
38	+}
39	+
40	+static int RSA_meth_set_verify(RSA_METHOD meth, int (verify) (int dtype, const unsigned char *m,
41	+ unsigned int m_length, const unsigned char sigbuf, unsigned int siglen, const RSA rsa))
42	+{
43	+ if (!meth) return 0;
44	+ meth->rsa_verify = verify;
45	+ return 1;
46	+}
47	+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L) \|\| defined(LIBRESSL_VERSION_NUMBER)
48
49	#endif // OSSL110COMPAT_H

Removed Link Here

(-)a/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp (-44 lines)
1	--- plugins/qca-ossl/qca-ossl.cpp.orig 2019-04-24 12:58:14 UTC
2	+++ plugins/qca-ossl/qca-ossl.cpp
3	@@ -62,12 +62,12 @@
4	#endif
5
6	// OpenSSL 1.1.0 compatibility macros
7	-#ifdef OSSL_110
8	+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
9	#define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new()
10	#define RSA_F_RSA_EAY_PRIVATE_DECRYPT RSA_F_RSA_OSSL_PRIVATE_DECRYPT
11	#endif
12
13	-#ifdef OSSL_110
14	+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
15	#include <openssl/kdf.h>
16	#endif
17
18	@@ -1280,7 +1280,7 @@ class opensslPbkdf2Context : public KDFContext (public
19	protected:
20	};
21
22	-#ifdef OSSL_110
23	+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
24	class opensslHkdfContext : public HKDFContext
25	{
26	public:
27	@@ -7416,7 +7416,7 @@ class opensslProvider : public Provider (public)
28	#endif
29	list += "pbkdf1(sha1)";
30	list += "pbkdf2(sha1)";
31	-#ifdef OSSL_110
32	+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
33	list += "hkdf(sha256)";
34	#endif
35	list += "pkey";
36	@@ -7489,7 +7489,7 @@ class opensslProvider : public Provider (public)
37	#endif
38	else if ( type == "pbkdf2(sha1)" )
39	return new opensslPbkdf2Context( this, type );
40	-#ifdef OSSL_110
41	+#if defined(OSSL_110) && !defined(LIBRESSL_VERSION_NUMBER)
42	else if ( type == "hkdf(sha256)" )
43	return new opensslHkdfContext( this, type );
44	#endif