[PATCH 5/8] Remove explicit check for gnutls_rnd

[Ján Tomko <jtomko@xxxxxxxxxx>]

Introduced in gnutls 2.12, but we require gnutls >= 3.2
Check added by commit <2d23d14>.

Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx>
---
 m4/virt-gnutls.m4    | 1 -
 src/util/vircrypto.c | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4
index 35792c060f..8c720c0cd7 100644
--- a/m4/virt-gnutls.m4
+++ b/m4/virt-gnutls.m4
@@ -37,7 +37,6 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[
       #include <gnutls/gnutls.h>
     ]])
 
-    AC_CHECK_FUNCS([gnutls_rnd])
     AC_CHECK_FUNCS([gnutls_cipher_encrypt])
     CFLAGS="$OLD_CFLAGS"
     LIBS="$OLD_LIBS"
diff --git a/src/util/vircrypto.c b/src/util/vircrypto.c
index d110adfe59..9bee04fcf9 100644
--- a/src/util/vircrypto.c
+++ b/src/util/vircrypto.c
@@ -336,7 +336,7 @@ virCryptoGenerateRandom(size_t nbytes)
     if (VIR_ALLOC_N(buf, nbytes) < 0)
         return NULL;
 
-#if HAVE_GNUTLS_RND
+#if WITH_GNUTLS
     /* Generate the byte stream using gnutls_rnd() if possible */
     if ((ret = gnutls_rnd(GNUTLS_RND_RANDOM, buf, nbytes)) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-- 
2.16.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list