External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove explicit check for gnutls_cipher_encrypt

Browse Source 
Introduced in gnutls 2.10, and we assume >= 3.2.

Commit 1ce9c08a added this check.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-05-15 12:45:12 +02:00
parent ac9ad77303
commit fbb07a757b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
m4/virt-gnutls.m4
View File

@ -37,7 +37,6 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
#include <gnutls/gnutls.h>
]])
AC_CHECK_FUNCS([gnutls_cipher_encrypt])
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
fi

4
src/util/vircrypto.c
View File

@ -131,7 +131,7 @@ virCryptoHaveCipher(virCryptoCipher algorithm)
switch (algorithm) {
case VIR_CRYPTO_CIPHER_AES256CBC:
#ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
#ifdef WITH_GNUTLS
return true;
#else
return false;
@ -146,7 +146,7 @@ virCryptoHaveCipher(virCryptoCipher algorithm)
}
#ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
#ifdef WITH_GNUTLS
/* virCryptoEncryptDataAESgntuls:
*
* Performs the AES gnutls encryption

8
tests/qemuxml2argvtest.c
View File

@ -1024,7 +1024,7 @@ mymain(void)
DO_TEST("disk-drive-network-sheepdog", NONE);
DO_TEST("disk-drive-network-rbd-auth", NONE);
DO_TEST("disk-drive-network-source-auth", NONE);
# ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
# ifdef WITH_GNUTLS
DO_TEST("disk-drive-network-rbd-auth-AES",
QEMU_CAPS_OBJECT_SECRET, QEMU_CAPS_VIRTIO_SCSI);
# endif
@ -1320,7 +1320,7 @@ mymain(void)
if (VIR_STRDUP_QUIET(driver.config->chardevTLSx509secretUUID,
"6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea") < 0)
return EXIT_FAILURE;
# ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
# ifdef WITH_GNUTLS
DO_TEST("serial-tcp-tlsx509-secret-chardev",
QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_DEVICE_ISA_SERIAL,
@ -1633,7 +1633,7 @@ mymain(void)
DO_TEST("encrypted-disk", NONE);
DO_TEST("encrypted-disk-usage", NONE);
# ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
# ifdef WITH_GNUTLS
DO_TEST("luks-disks", QEMU_CAPS_OBJECT_SECRET);
DO_TEST("luks-disks-source", QEMU_CAPS_OBJECT_SECRET);
DO_TEST_PARSE_ERROR("luks-disks-source-qcow2", QEMU_CAPS_OBJECT_SECRET);
@ -2331,7 +2331,7 @@ mymain(void)
DO_TEST("hostdev-scsi-virtio-iscsi-auth",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_DEVICE_SCSI_GENERIC);
# ifdef HAVE_GNUTLS_CIPHER_ENCRYPT
# ifdef WITH_GNUTLS
DO_TEST("disk-hostdev-scsi-virtio-iscsi-auth-AES",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_OBJECT_SECRET,