eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Link only libcrypto from openssl

Browse Source 
Reduces initramfs dependencies. libcrypto.pc is available in openssl
0.9.8+
This commit is contained in:
Alex Xu (Hello71)
2023-04-17 12:21:04 -04:00
committed by Milan Broz
parent 32febb4483
commit 234ca010e2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -310,17 +310,17 @@ AC_DEFUN([CONFIGURE_GCRYPT], [
]) ])
AC_DEFUN([CONFIGURE_OPENSSL], [ 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.])) AC_MSG_ERROR([You need openssl library.]))
CRYPTO_CFLAGS=$OPENSSL_CFLAGS CRYPTO_CFLAGS=$LIBCRYPTO_CFLAGS
CRYPTO_LIBS=$OPENSSL_LIBS CRYPTO_LIBS=$LIBCRYPTO_LIBS
use_internal_pbkdf2=0 use_internal_pbkdf2=0
if test "x$enable_static_cryptsetup" = "xyes"; then if test "x$enable_static_cryptsetup" = "xyes"; then
saved_PKG_CONFIG=$PKG_CONFIG saved_PKG_CONFIG=$PKG_CONFIG
PKG_CONFIG="$PKG_CONFIG --static" PKG_CONFIG="$PKG_CONFIG --static"
PKG_CHECK_MODULES([OPENSSL_STATIC], [openssl]) PKG_CHECK_MODULES([LIBCRYPTO_STATIC], [libcrypto])
CRYPTO_STATIC_LIBS=$OPENSSL_STATIC_LIBS CRYPTO_STATIC_LIBS=$LIBCRYPTO_STATIC_LIBS
PKG_CONFIG=$saved_PKG_CONFIG PKG_CONFIG=$saved_PKG_CONFIG
fi fi
]) ])

2
meson.build
View File

@@ -481,7 +481,7 @@ if get_option('crypto-backend') == 'gcrypt'
description: 'Requested gcrypt version') description: 'Requested gcrypt version')
elif get_option('crypto-backend') == 'openssl' elif get_option('crypto-backend') == 'openssl'
use_internal_pbkdf2 = false use_internal_pbkdf2 = false
crypto_backend_library = dependency('openssl', crypto_backend_library = dependency('libcrypto',
version: '>=0.9.8', version: '>=0.9.8',
static: enable_static) static: enable_static)
elif get_option('crypto-backend') == 'nss' elif get_option('crypto-backend') == 'nss'