mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-30 16:12:58 -05:00
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
diff -up dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c.opensslv3 dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c
|
||
|
|
--- dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c.opensslv3 2021-06-03 18:56:52.573174433 +0200
|
||
|
|
+++ dovecot-2.3.14/src/lib-dcrypt/dcrypt-openssl.c 2021-06-03 18:56:52.585174274 +0200
|
||
|
|
@@ -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)
|