kore

commit a54f806978df92890b6d5d0ea328bcd3382a37be
parent 0337af20670ae1001bf0d0945c8df9d4127487b7
Author: Joris Vink <joris@coders.se>
Date:   Mon,  6 Dec 2021 23:58:13 +0100

Don't let kore build with openssl 3 again.

The whole privilege separation breaks with OpenSSL 3, even if it builds.

I guess it is somewhat time to start on donutls.

Diffstat:
include/kore/kore.h
 | 
5
-----
src/cli.c
 | 
6
------
src/keymgr.c
 | 
10
----------

3 files changed, 0 insertions(+), 21 deletions(-)
diff --git a/include/kore/kore.h b/include/kore/kore.h
@@ -79,11 +79,6 @@ extern int daemon(int, int);
 #endif
 #endif
 
-/* Ignore deprecation warnings for OpenSSL 3 for now. */
-#if defined(OPENSSL_VERSION_MAJOR)
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #if defined(__OpenBSD__)
 #define KORE_USE_PLATFORM_PLEDGE	1
 #endif
diff --git a/src/cli.c b/src/cli.c
@@ -26,12 +26,6 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/x509v3.h>
-
-/* Ignore deprecation warnings for OpenSSL 3 for now. */
-#if defined(OPENSSL_VERSION_MAJOR)
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
 #endif
 
 #include <ctype.h>
diff --git a/src/keymgr.c b/src/keymgr.c
@@ -689,12 +689,7 @@ keymgr_rsa_encrypt(struct kore_msg *msg, const void *data, struct key *key)
 	u_int8_t			buf[1024];
 
 	req = (const struct kore_keyreq *)data;
-
-#if defined(OPENSSL_VERSION_MAJOR)
-	rsa = EVP_PKEY_get0(key->pkey);
-#else
 	rsa = EVP_PKEY_get0_RSA(key->pkey);
-#endif
 
 	keylen = RSA_size(rsa);
 	if (req->data_len > keylen || keylen > sizeof(buf))
@@ -718,12 +713,7 @@ keymgr_ecdsa_sign(struct kore_msg *msg, const void *data, struct key *key)
 	u_int8_t			sig[1024];
 
 	req = (const struct kore_keyreq *)data;
-
-#if defined(OPENSSL_VERSION_MAJOR)
-	ec = EVP_PKEY_get0(key->pkey);
-#else
 	ec = EVP_PKEY_get0_EC_KEY(key->pkey);
-#endif
 
 	len = ECDSA_size(ec);
 	if (req->data_len > len || len > sizeof(sig))