From nobody Wed Dec 17 04:18:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152638585476687.72634866074429; Tue, 15 May 2018 05:04:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 08F7315F44C; Tue, 15 May 2018 12:04:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA121617B9; Tue, 15 May 2018 12:04:12 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 561AF14B20; Tue, 15 May 2018 12:04:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4FC40T4024790 for ; Tue, 15 May 2018 08:04:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E20A200BCE4; Tue, 15 May 2018 12:04:00 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A7E342026DFD for ; Tue, 15 May 2018 12:03:59 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 May 2018 14:03:52 +0200 Message-Id: <05a1f601b236d702a88e9c8744b2b427d9e3c927.1526385621.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] Remove explicit check for gnutls_cipher_encrypt X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 15 May 2018 12:04:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Introduced in gnutls 2.10, and we assume >=3D 3.2. Commit 1ce9c08a added this check. Signed-off-by: J=C3=A1n Tomko --- m4/virt-gnutls.m4 | 1 - src/util/vircrypto.c | 4 ++-- tests/qemuxml2argvtest.c | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 index 8c720c0cd7..f25cfb60f7 100644 --- a/m4/virt-gnutls.m4 +++ b/m4/virt-gnutls.m4 @@ -37,7 +37,6 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ #include ]]) =20 - AC_CHECK_FUNCS([gnutls_cipher_encrypt]) CFLAGS=3D"$OLD_CFLAGS" LIBS=3D"$OLD_LIBS" fi diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c index 9bee04fcf9..d789129a86 100644 --- a/src/util/vircrypto.c +++ b/src/util/vircrypto.c @@ -131,7 +131,7 @@ virCryptoHaveCipher(virCryptoCipher algorithm) switch (algorithm) { =20 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) } =20 =20 -#ifdef HAVE_GNUTLS_CIPHER_ENCRYPT +#ifdef WITH_GNUTLS /* virCryptoEncryptDataAESgntuls: * * Performs the AES gnutls encryption diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d4d64b0d21..eb41c27767 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -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, @@ -1617,7 +1617,7 @@ mymain(void) =20 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= ); @@ -2310,7 +2310,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, --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list