You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.3 KiB
46 lines
1.3 KiB
From: =?utf-8?q?Christian_G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Wed, 11 May 2022 20:27:53 +0200
|
|
Author: Michal Hlavinka
|
|
Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1962035
|
|
Subject: Support openssl 3.0
|
|
|
|
---
|
|
src/lib-dcrypt/dcrypt-openssl.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
|
|
index 1cbe352..5570d62 100644
|
|
--- a/src/lib-dcrypt/dcrypt-openssl.c
|
|
+++ b/src/lib-dcrypt/dcrypt-openssl.c
|
|
@@ -73,10 +73,30 @@
|
|
2<tab>key algo oid<tab>1<tab>symmetric algo name<tab>salt<tab>hash algo<tab>rounds<tab>E(RSA = i2d_PrivateKey, EC=Private Point)<tab>key id
|
|
**/
|
|
|
|
+#if OPENSSL_VERSION_MAJOR == 3
|
|
+static EC_KEY *EVP_PKEY_get0_EC_KEYv3(EVP_PKEY *key)
|
|
+{
|
|
+ EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key);
|
|
+ EVP_PKEY_set1_EC_KEY(key, eck);
|
|
+ EC_KEY_free(eck);
|
|
+ return eck;
|
|
+}
|
|
+
|
|
+static EC_KEY *EVP_PKEY_get1_EC_KEYv3(EVP_PKEY *key)
|
|
+{
|
|
+ EC_KEY *eck = EVP_PKEY_get1_EC_KEY(key);
|
|
+ EVP_PKEY_set1_EC_KEY(key, eck);
|
|
+ return eck;
|
|
+}
|
|
+
|
|
+#define EVP_PKEY_get0_EC_KEY EVP_PKEY_get0_EC_KEYv3
|
|
+#define EVP_PKEY_get1_EC_KEY EVP_PKEY_get1_EC_KEYv3
|
|
+#else
|
|
#ifndef HAVE_EVP_PKEY_get0
|
|
#define EVP_PKEY_get0_EC_KEY(x) x->pkey.ec
|
|
#define EVP_PKEY_get0_RSA(x) x->pkey.rsa
|
|
#endif
|
|
+#endif
|
|
|
|
#ifndef HAVE_OBJ_LENGTH
|
|
#define OBJ_length(o) ((o)->length)
|