49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
|
diff -up libssh-0.10.6/src/libcrypto.c.no-engine libssh-0.10.6/src/libcrypto.c
|
||
|
|
--- libssh-0.10.6/src/libcrypto.c.no-engine 2024-07-31 09:25:56.460404672 +0200
|
||
|
|
+++ libssh-0.10.6/src/libcrypto.c 2024-07-31 09:28:46.900273530 +0200
|
||
|
|
@@ -94,7 +94,7 @@ void ssh_reseed(void){
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
-#ifndef WITH_PKCS11_PROVIDER
|
||
|
|
+#if defined(WITH_PKCS11_URI) && !defined(WITH_PKCS11_PROVIDER)
|
||
|
|
static ENGINE *engine = NULL;
|
||
|
|
|
||
|
|
ENGINE *pki_get_engine(void)
|
||
|
|
@@ -126,7 +126,7 @@ ENGINE *pki_get_engine(void)
|
||
|
|
}
|
||
|
|
return engine;
|
||
|
|
}
|
||
|
|
-#endif /* WITH_PKCS11_PROVIDER */
|
||
|
|
+#endif /* defined(WITH_PKCS11_URI) && !defined(WITH_PKCS11_PROVIDER) */
|
||
|
|
|
||
|
|
#ifdef HAVE_OPENSSL_EVP_KDF_CTX
|
||
|
|
#if OPENSSL_VERSION_NUMBER < 0x30000000L
|
||
|
|
diff -up libssh-0.10.6/src/pki_crypto.c.no-engine libssh-0.10.6/src/pki_crypto.c
|
||
|
|
--- libssh-0.10.6/src/pki_crypto.c.no-engine 2024-07-31 09:26:34.296823306 +0200
|
||
|
|
+++ libssh-0.10.6/src/pki_crypto.c 2024-07-31 09:29:36.414810967 +0200
|
||
|
|
@@ -33,7 +33,9 @@
|
||
|
|
|
||
|
|
#include <openssl/pem.h>
|
||
|
|
#include <openssl/evp.h>
|
||
|
|
+#if defined(WITH_PKCS11_URI) && !defined(WITH_PKCS11_PROVIDER)
|
||
|
|
#include <openssl/engine.h>
|
||
|
|
+#endif
|
||
|
|
#include <openssl/err.h>
|
||
|
|
#if OPENSSL_VERSION_NUMBER < 0x30000000L
|
||
|
|
#include <openssl/dsa.h>
|
||
|
|
diff -up libssh-0.10.6/src/libcrypto.c.no-engine libssh-0.10.6/src/libcrypto.c
|
||
|
|
--- libssh-0.10.6/src/libcrypto.c.no-engine 2024-07-31 11:03:45.262319724 +0200
|
||
|
|
+++ libssh-0.10.6/src/libcrypto.c 2024-07-31 11:04:59.842161279 +0200
|
||
|
|
@@ -53,7 +53,9 @@
|
||
|
|
#include <openssl/core_names.h>
|
||
|
|
#endif /* OPENSSL_VERSION_NUMBER */
|
||
|
|
#include <openssl/rand.h>
|
||
|
|
+#if defined(WITH_PKCS11_URI) && !defined(WITH_PKCS11_PROVIDER)
|
||
|
|
#include <openssl/engine.h>
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include "libcrypto-compat.h"
|
||
|
|
|
||
|
|
|