Attachment 217830 Details for Bug 248590 – This is the gentoo patch applied after make extract and then recreated using make makepatch

[patch] This is the gentoo patch applied after make extract and then recreated using make makepatch

patch-plugins_qca-ossl_qca-ossl.cpp (text/plain), 2.81 KB, created by tjlegg on 2020-09-09 04:57:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tjlegg

Created: 2020-09-09 04:57:01 UTC

Size: 2.81 KB

patch

obsolete

>--- plugins/qca-ossl/qca-ossl.cpp.orig	2020-07-06 09:43:51 UTC
>+++ plugins/qca-ossl/qca-ossl.cpp
>@@ -41,7 +41,13 @@
> #include <openssl/pkcs12.h>
> #include <openssl/ssl.h>
> 
>+#ifndef RSA_F_RSA_OSSL_PRIVATE_DECRYPT
>+#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT RSA_F_RSA_EAY_PRIVATE_DECRYPT
>+#endif
>+
>+#ifndef LIBRESSL_VERSION_NUMBER
> #include <openssl/kdf.h>
>+#endif
> 
> using namespace QCA;
> 
>@@ -1262,6 +1268,7 @@ class opensslPbkdf2Context : public KDFContext (public
> protected:
> };
> 
>+#ifndef LIBRESSL_VERSION_NUMBER
> class opensslHkdfContext : public HKDFContext
> {
>     Q_OBJECT
>@@ -1291,6 +1298,7 @@ class opensslHkdfContext : public HKDFContext (public)
> 		return out;
> 	}
> };
>+#endif // LIBRESSL_VERSION_NUMBER
> 
> class opensslHMACContext : public MACContext
> {
>@@ -4990,7 +4998,11 @@ class MyTLSContext : public TLSContext (public)
> 		case TLS::TLS_v1:
> 			ctx = SSL_CTX_new(TLS_client_method());
> 			SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
>+#ifdef TLS1_3_VERSION
> 			SSL_CTX_set_max_proto_version(ctx, TLS1_3_VERSION);
>+#else
>+			SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
>+#endif
> 			break;
> 		case TLS::DTLS_v1:
> 		default:
>@@ -5011,7 +5023,11 @@ class MyTLSContext : public TLSContext (public)
> 		QStringList cipherList;
> 		for(int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) {
> 			const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i);
>+#ifndef LIBRESSL_VERSION_NUMBER
> 			cipherList += QString::fromLatin1(SSL_CIPHER_standard_name(thisCipher));
>+#else
>+			cipherList += QString::fromLatin1(SSL_CIPHER_get_name(thisCipher));
>+#endif
> 		}
> 		sk_SSL_CIPHER_free(sk);
> 
>@@ -5404,7 +5420,11 @@ class MyTLSContext : public TLSContext (public)
> 			sessInfo.version = TLS::TLS_v1;
> 		}
> 
>+#ifndef LIBRESSL_VERSION_NUMBER
> 		sessInfo.cipherSuite = QString::fromLatin1(SSL_CIPHER_standard_name(SSL_get_current_cipher(ssl)));
>+#else
>+		sessInfo.cipherSuite = QString::fromLatin1(SSL_CIPHER_get_name(SSL_get_current_cipher(ssl)));
>+#endif
> 
> 		sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits));
> 
>@@ -6751,7 +6771,9 @@ class opensslProvider : public Provider (public)
> #endif
> 		list += QStringLiteral("pbkdf1(sha1)");
> 		list += QStringLiteral("pbkdf2(sha1)");
>+#ifndef LIBRESSL_VERSION_NUMBER
> 		list += QStringLiteral("hkdf(sha256)");
>+#endif
> 		list += QStringLiteral("pkey");
> 		list += QStringLiteral("dlgroup");
> 		list += QStringLiteral("rsa");
>@@ -6820,8 +6842,10 @@ class opensslProvider : public Provider (public)
> #endif
> 		else if ( type == QLatin1String("pbkdf2(sha1)") )
> 			return new opensslPbkdf2Context( this, type );
>+#ifndef LIBRESSL_VERSION_NUMBER
> 		else if ( type == QLatin1String("hkdf(sha256)") )
> 			return new opensslHkdfContext( this, type );
>+#endif
> 		else if ( type == QLatin1String("hmac(md5)") )
> 			return new opensslHMACContext( EVP_md5(), this, type );
> 		else if ( type == QLatin1String("hmac(sha1)") )

Actions: View | Diff

Attachments on bug 248590: 217830 | 219086