[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2] libcrypto: fix compilation with LibreSSL
[Thread Prev] | [Thread Next]
- Subject: [PATCH v2] libcrypto: fix compilation with LibreSSL
- From: Stefan Strogin <steils@xxxxxxxxxx>
- Reply-to: libssh@xxxxxxxxxx
- Date: Mon, 1 Jul 2019 18:19:55 +0300
- To: libssh@xxxxxxxxxx
- Cc: Stefan Strogin <steils@xxxxxxxxxx>
LibreSSL does not support FIPS mode, check for FIPS_mode() in
ConfigureChecks.cmake.
Signed-off-by: Stefan Strogin <steils@xxxxxxxxxx>
---
ConfigureChecks.cmake | 4 ++++
include/libssh/libcrypto.h | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 643a0a4b..a5f4e74b 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -131,6 +131,10 @@ if (OPENSSL_FOUND)
set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
check_function_exists(EVP_KDF_CTX_new_id HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID)
+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
+ check_function_exists(FIPS_mode HAVE_FIPS_MODE)
+
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_CRYPTO_LIBRARY})
check_function_exists(RAND_priv_bytes HAVE_OPENSSL_RAND_PRIV_BYTES)
diff --git a/include/libssh/libcrypto.h b/include/libssh/libcrypto.h
index 541912b5..94d6bfae 100644
--- a/include/libssh/libcrypto.h
+++ b/include/libssh/libcrypto.h
@@ -112,7 +112,11 @@ typedef BN_CTX* bignum_CTX;
/* Returns true if the OpenSSL is operating in FIPS mode */
+#ifdef HAVE_FIPS_MODE
#define ssh_fips_mode() (FIPS_mode() != 0)
+#else
+#define ssh_fips_mode() false
+#endif
#endif /* HAVE_LIBCRYPTO */
--
2.22.0
| Re: [PATCH v2] libcrypto: fix compilation with LibreSSL | Andreas Schneider <asn@xxxxxxxxxxxxxx> |
| Re: [PATCH v2] libcrypto: fix compilation with LibreSSL | Andreas Schneider <asn@xxxxxxxxxxxxxx> |