yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

crypto: bump min gcrypt to 1.8.0, dropping RHEL-7 support

Browse Source 
It has been over two years since RHEL-8 was released, and thus per the
platform build policy, we no longer need to support RHEL-7 as a build
target. This lets us increment the minimum required gcrypt version and
assume that HMAC is always supported

Per repology, current shipping versions are:

             RHEL-8: 1.8.5
      Debian Buster: 1.8.4
 openSUSE Leap 15.2: 1.8.2
   Ubuntu LTS 18.04: 1.8.1
   Ubuntu LTS 20.04: 1.8.5
            FreeBSD: 1.9.2
          Fedora 33: 1.8.6
          Fedora 34: 1.9.3
            OpenBSD: 1.9.3
     macOS HomeBrew: 1.9.3

Ubuntu LTS 18.04 has the oldest version and so 1.8.0 is the new minimum.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210514120415.1368922-6-berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
[thuth: rebased to use .gitlab-ci.d/buildtest.yml]
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-05-14 13:04:08 +01:00 committed by Thomas Huth
parent 115e4b7003
commit b33a84632a
3 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.d/buildtest.yml
View File

@ -630,16 +630,6 @@ build-coroutine-sigaltstack:
# #
# These jobs test old gcrypt and nettle from RHEL7 # These jobs test old gcrypt and nettle from RHEL7
# which had some API differences. # which had some API differences.
crypto-old-gcrypt:
extends: .native_build_job_template
needs:
job: amd64-centos7-container
variables:
IMAGE: centos7
TARGETS: x86_64-softmmu x86_64-linux-user
CONFIGURE_ARGS: --disable-nettle --enable-gcrypt
MAKE_CHECK_ARGS: check
crypto-only-gnutls: crypto-only-gnutls:
extends: .native_build_job_template extends: .native_build_job_template
needs: needs:

18
configure vendored
View File

@ -407,7 +407,6 @@ gnutls="$default_feature"
nettle="$default_feature" nettle="$default_feature"
nettle_xts="no" nettle_xts="no"
gcrypt="$default_feature" gcrypt="$default_feature"
gcrypt_hmac="no"
gcrypt_xts="no" gcrypt_xts="no"
qemu_private_xts="yes" qemu_private_xts="yes"
auth_pam="$default_feature" auth_pam="$default_feature"
@ -2860,7 +2859,7 @@ has_libgcrypt() {
maj=`libgcrypt-config --version | awk -F . '{print $1}'` maj=`libgcrypt-config --version | awk -F . '{print $1}'`
min=`libgcrypt-config --version | awk -F . '{print $2}'` min=`libgcrypt-config --version | awk -F . '{print $2}'`
if test $maj != 1 || test $min -lt 5 if test $maj != 1 || test $min -lt 8
then then
return 1 return 1
fi fi
@ -2926,18 +2925,6 @@ if test "$gcrypt" != "no"; then
gcrypt="yes" gcrypt="yes"
cat > $TMPC << EOF cat > $TMPC << EOF
#include <gcrypt.h> #include <gcrypt.h>
int main(void) {
gcry_mac_hd_t handle;
gcry_mac_open(&handle, GCRY_MAC_HMAC_MD5,
GCRY_MAC_FLAG_SECURE, NULL);
return 0;
}
EOF
if compile_prog "$gcrypt_cflags" "$gcrypt_libs" ; then
gcrypt_hmac=yes
fi
cat > $TMPC << EOF
#include <gcrypt.h>
int main(void) { int main(void) {
gcry_cipher_hd_t handle; gcry_cipher_hd_t handle;
gcry_cipher_open(&handle, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_XTS, 0); gcry_cipher_open(&handle, GCRY_CIPHER_AES, GCRY_CIPHER_MODE_XTS, 0);
@ -5721,9 +5708,6 @@ if test "$gnutls" = "yes" ; then
fi fi
if test "$gcrypt" = "yes" ; then if test "$gcrypt" = "yes" ; then
echo "CONFIG_GCRYPT=y" >> $config_host_mak echo "CONFIG_GCRYPT=y" >> $config_host_mak
if test "$gcrypt_hmac" = "yes" ; then
echo "CONFIG_GCRYPT_HMAC=y" >> $config_host_mak
fi
echo "GCRYPT_CFLAGS=$gcrypt_cflags" >> $config_host_mak echo "GCRYPT_CFLAGS=$gcrypt_cflags" >> $config_host_mak
echo "GCRYPT_LIBS=$gcrypt_libs" >> $config_host_mak echo "GCRYPT_LIBS=$gcrypt_libs" >> $config_host_mak
fi fi

6
crypto/meson.build
View File

@ -26,11 +26,7 @@ if 'CONFIG_NETTLE' in config_host
crypto_ss.add(files('hash-nettle.c', 'hmac-nettle.c', 'pbkdf-nettle.c')) crypto_ss.add(files('hash-nettle.c', 'hmac-nettle.c', 'pbkdf-nettle.c'))
elif 'CONFIG_GCRYPT' in config_host elif 'CONFIG_GCRYPT' in config_host
crypto_ss.add(files('hash-gcrypt.c', 'pbkdf-gcrypt.c')) crypto_ss.add(files('hash-gcrypt.c', 'pbkdf-gcrypt.c'))
if 'CONFIG_GCRYPT_HMAC' in config_host crypto_ss.add(files('hmac-gcrypt.c'))
crypto_ss.add(files('hmac-gcrypt.c'))
else
crypto_ss.add(files('hmac-glib.c'))
endif
else else
crypto_ss.add(files('hash-glib.c', 'hmac-glib.c', 'pbkdf-stub.c')) crypto_ss.add(files('hash-glib.c', 'hmac-glib.c', 'pbkdf-stub.c'))
endif endif