Attachment 204428 Details for Bug 235883 – fix building 2.2.1_1 with libressl

[patch] fix building 2.2.1_1 with libressl

qca-2.2.1_1-libressl.patch (text/plain), 3.64 KB, created by Felix Palmen on 2019-05-17 12:25:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Palmen

Created: 2019-05-17 12:25:48 UTC

Size: 3.64 KB

patch

obsolete

>Index: files/patch-plugins_qca-ossl_ossl110-compat.h
>===================================================================
>--- files/patch-plugins_qca-ossl_ossl110-compat.h	(nonexistent)
>+++ files/patch-plugins_qca-ossl_ossl110-compat.h	(working copy)
>@@ -0,0 +1,42 @@
>+--- plugins/qca-ossl/ossl110-compat.h.orig	2019-04-24 12:58:14 UTC
>++++ plugins/qca-ossl/ossl110-compat.h
>+@@ -25,9 +25,11 @@
>+ #include <openssl/rsa.h>
>+ #include <openssl/dsa.h>
>+ 
>+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
>++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined ( LIBRESSL_VERSION_NUMBER )
>+ #define RSA_F_RSA_METH_DUP 161
>+ 
>++#ifndef LIBRESSL_VERSION_NUMBER
>++
>+ static void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps)
>+ {
>+     if (pr)
>+@@ -205,6 +207,8 @@ static int RSA_meth_set_priv_dec(RSA_METHOD *rsa, int 
>+     return 1;
>+ }
>+ 
>++#endif
>++
>+ 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))
>+ {
>+@@ -221,6 +225,8 @@ static int RSA_meth_set_verify(RSA_METHOD *meth, int (
>+     return 1;
>+ }
>+ 
>++#ifndef LIBRESSL_VERSION_NUMBER
>++
>+ static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))
>+ {
>+     if (!meth) return 0;
>+@@ -269,6 +275,8 @@ static void HMAC_CTX_free(HMAC_CTX *ctx)
>+ 
>+ #define X509_REVOKED_get0_serialNumber(rev) (rev)->serialNumber
>+ #define X509_REVOKED_get0_revocationDate(rev) (rev)->revocationDate
>++
>++#endif
>+ 
>+ #endif // OPENSSL_VERSION_NUMBER < 0x10100000L
>+ 
>
>Property changes on: files/patch-plugins_qca-ossl_ossl110-compat.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-plugins_qca-ossl_qca-ossl.cpp
>===================================================================
>--- files/patch-plugins_qca-ossl_qca-ossl.cpp	(nonexistent)
>+++ files/patch-plugins_qca-ossl_qca-ossl.cpp	(working copy)
>@@ -0,0 +1,41 @@
>+--- plugins/qca-ossl/qca-ossl.cpp.orig	2019-04-24 12:58:14 UTC
>++++ plugins/qca-ossl/qca-ossl.cpp
>+@@ -63,9 +63,11 @@
>+ 
>+ // OpenSSL 1.1.0 compatibility macros
>+ #ifdef OSSL_110
>++#ifndef 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
>++#endif
>+ 
>+ #ifdef OSSL_110
>+ #include <openssl/kdf.h>
>+@@ -1281,6 +1283,7 @@ class opensslPbkdf2Context : public KDFContext (protec
>+ };
>+ 
>+ #ifdef OSSL_110
>++#ifndef LIBRESSL_VERSION_NUMBER
>+ class opensslHkdfContext : public HKDFContext
>+ {
>+ public:
>+@@ -1310,6 +1313,7 @@ class opensslHkdfContext : public HKDFContext (public)
>+ 	}
>+ };
>+ #endif
>++#endif
>+ 
>+ class opensslHMACContext : public MACContext
>+ {
>+@@ -7490,8 +7494,10 @@ class opensslProvider : public Provider (public)
>+ 		else if ( type == "pbkdf2(sha1)" )
>+ 			return new opensslPbkdf2Context( this, type );
>+ #ifdef OSSL_110
>++#ifndef LIBRESSL_VERSION_NUMBER
>+ 		else if ( type == "hkdf(sha256)" )
>+ 			return new opensslHkdfContext( this, type );
>++#endif
>+ #endif
>+ 		else if ( type == "hmac(md5)" )
>+ 			return new opensslHMACContext( EVP_md5(), this, type );
>
>Property changes on: files/patch-plugins_qca-ossl_qca-ossl.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 235883: 202186 | 204428