Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-08-07 19:51:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build-sys: Remove checking for GnuTLS and certtool

Browse Source 
Remove the checks for GnuTLS and certtool from the build system now that
certtool is not used anymore.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2026-05-05 18:36:27 +00:00
parent c0b20c553e
commit f8042da600
3 changed files with 17 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -200,26 +200,6 @@ AS_CASE([$host_os],
AM_CONDITIONAL([WITH_CHARDEV],[test "$with_chardev" = "yes"])
AC_MSG_RESULT($with_chardev)
AC_ARG_WITH([gnutls],
AS_HELP_STRING([--with-gnutls],[build with gnutls library]),
[],
[with_gnutls=check]
)
dnl certtool changed how it takes private key passwords
dnl 3.3.29 is too old (RHEL 7); we need at least gnutls 3.4.0
AS_IF([test "x$with_gnutls" != "xno"],[
AC_PATH_PROG([GNUTLS_CERTTOOL], certtool)
AS_IF([test "x$GNUTLS_CERTTOOL" = "x" && test "x$with_gnutls" = "xyes"],
[AC_MSG_ERROR("Could not find certtool. Is gnutls-utils/gnutls-bin installed?")],
[test "x$GNUTLS_CERTTOOL" = "x"],
[with_gnutls=no]
)
AS_IF([test "x$with_gnutls" != "xno"],[with_gnutls="yes"])
])
AM_CONDITIONAL([WITH_GNUTLS], [test "x$with_gnutls" = "xyes"])
DEFAULT_PCR_BANKS="sha256"
AC_ARG_ENABLE([default-pcr-banks],
AS_HELP_STRING(

8
run_tests
View File

@ -1,6 +1,6 @@
#!/bin/bash
if [ $(uname -p) != "x86_64" ]; then
if [ $(uname -m) != "x86_64" ]; then
echo "This test only runs on x86_64 host"
exit 1
fi
@ -16,7 +16,7 @@ WITHOUT_CUSE="--without-cuse"
# doesn't behave as it does with 64bit. test_hashing2 gets stuck.
CFLAGS='-m64' ./configure --with-openssl --with-gnutls --prefix=/usr --libdir=/lib64 ${WITHOUT_CUSE} && \
CFLAGS='-m64' ./configure --with-openssl --prefix=/usr --libdir=/lib64 ${WITHOUT_CUSE} && \
make clean && \
make -j$(nproc) &&
sudo make -j$(nproc) install &&
@ -29,7 +29,7 @@ if [ -z "${WITHOUT_CUSE}" ]; then
fi
PKG_CONFIG_PATH=/usr/lib/pkgconfig \
CFLAGS='-m32' ./configure --with-openssl --with-gnutls --prefix=/usr --libdir=/lib ${WITHOUT_CUSE} && \
CFLAGS='-m32' ./configure --with-openssl --prefix=/usr --libdir=/lib ${WITHOUT_CUSE} && \
make clean && \
make -j$(nproc) &&
sudo make -j$(nproc) install &&
@ -42,7 +42,7 @@ if [ -z "${WITHOUT_CUSE}" ]; then
exit 1
fi
CFLAGS='-m64' ./configure --with-openssl --with-gnutls --prefix=/usr --libdir=/lib64 ${WITHOUT_CUSE} && \
CFLAGS='-m64' ./configure --with-openssl --prefix=/usr --libdir=/lib64 ${WITHOUT_CUSE} && \
make clean && \
make -j$(nproc) &&
SWTPM_EXE=/tmp/swtpm32 make -j$(nproc) check ||

32
tests/Makefile.am
View File

@ -15,9 +15,8 @@ if ENABLE_TESTS
TESTS = \
test_vtpm_proxy \
test_tpm2_vtpm_proxy
TESTS += \
test_tpm2_vtpm_proxy \
\
test_commandline \
test_ctrlchannel \
test_ctrlchannel2 \
@ -37,6 +36,8 @@ TESTS += \
test_setbuffersize \
test_volatilestate \
test_swtpm_bios \
test_swtpm_cert \
test_swtpm_setup_create_cert \
test_tpm_probe \
test_tpm12 \
test_wrongorder \
@ -45,9 +46,8 @@ TESTS += \
test_print_states \
test_swtpm_setup_overwrite \
test_swtpm_setup_file_backend \
test_swtpm_setup_misc
TESTS += \
test_swtpm_setup_misc \
\
test_tpm2_avoid_da_lockout \
test_tpm2_chroot_socket \
test_tpm2_chroot_chardev \
@ -64,11 +64,13 @@ TESTS += \
test_tpm2_hashing2 \
test_tpm2_hashing3 \
test_tpm2_migration_key \
test_tpm2_parameters \
test_tpm2_partial_reads \
test_tpm2_pcap \
test_tpm2_print_capabilities \
test_tpm2_print_states \
test_tpm2_resume_volatile \
test_tpm2_samples_create_tpmca.test \
test_tpm2_savestate \
test_tpm2_save_load_encrypted_state \
test_tpm2_save_load_state \
@ -79,6 +81,11 @@ TESTS += \
test_tpm2_save_load_state_da_timeout \
test_tpm2_save_load_state_locking \
test_tpm2_setbuffersize \
test_tpm2_swtpm_cert \
test_tpm2_swtpm_cert_ecc \
test_tpm2_swtpm_localca \
test_tpm2_swtpm_localca_pkcs11.test \
test_tpm2_swtpm_setup_create_cert \
test_tpm2_volatilestate \
test_tpm2_wrongorder \
test_tpm2_probe \
@ -93,19 +100,6 @@ TESTS += \
test_tpm2_swtpm_setup_profile_name \
test_tpm2_libtpms_versions_profiles
if WITH_GNUTLS
TESTS += \
test_swtpm_cert \
test_swtpm_setup_create_cert \
test_tpm2_parameters \
test_tpm2_samples_create_tpmca.test
test_tpm2_swtpm_cert \
test_tpm2_swtpm_cert_ecc \
test_tpm2_swtpm_localca \
test_tpm2_swtpm_localca_pkcs11.test \
test_tpm2_swtpm_setup_create_cert
endif # WITH_GNUTLS
endif # ENABLE_TESTS
TEST_UTILS = \