From 234ca010e272de9c5f23e4adeeb57bf4be00187d Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Mon, 17 Apr 2023 12:21:04 -0400 Subject: [PATCH] Link only libcrypto from openssl Reduces initramfs dependencies. libcrypto.pc is available in openssl 0.9.8+ --- configure.ac | 10 +++++----- meson.build | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index c95c1f68..9e06ca27 100644 --- a/configure.ac +++ b/configure.ac @@ -310,17 +310,17 @@ AC_DEFUN([CONFIGURE_GCRYPT], [ ]) AC_DEFUN([CONFIGURE_OPENSSL], [ - PKG_CHECK_MODULES([OPENSSL], [openssl >= 0.9.8],, + PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto >= 0.9.8],, AC_MSG_ERROR([You need openssl library.])) - CRYPTO_CFLAGS=$OPENSSL_CFLAGS - CRYPTO_LIBS=$OPENSSL_LIBS + CRYPTO_CFLAGS=$LIBCRYPTO_CFLAGS + CRYPTO_LIBS=$LIBCRYPTO_LIBS use_internal_pbkdf2=0 if test "x$enable_static_cryptsetup" = "xyes"; then saved_PKG_CONFIG=$PKG_CONFIG PKG_CONFIG="$PKG_CONFIG --static" - PKG_CHECK_MODULES([OPENSSL_STATIC], [openssl]) - CRYPTO_STATIC_LIBS=$OPENSSL_STATIC_LIBS + PKG_CHECK_MODULES([LIBCRYPTO_STATIC], [libcrypto]) + CRYPTO_STATIC_LIBS=$LIBCRYPTO_STATIC_LIBS PKG_CONFIG=$saved_PKG_CONFIG fi ]) diff --git a/meson.build b/meson.build index 7368fb3d..7cf869a8 100644 --- a/meson.build +++ b/meson.build @@ -481,7 +481,7 @@ if get_option('crypto-backend') == 'gcrypt' description: 'Requested gcrypt version') elif get_option('crypto-backend') == 'openssl' use_internal_pbkdf2 = false - crypto_backend_library = dependency('openssl', + crypto_backend_library = dependency('libcrypto', version: '>=0.9.8', static: enable_static) elif get_option('crypto-backend') == 'nss'