]> xenbits.xensource.com Git - libvirt.git/commitdiff
Remove explicit check for gnutls_rnd
authorJán Tomko <jtomko@redhat.com>
Tue, 15 May 2018 10:42:20 +0000 (12:42 +0200)
committerJán Tomko <jtomko@redhat.com>
Wed, 16 May 2018 08:40:40 +0000 (10:40 +0200)
Introduced in gnutls 2.12, but we require gnutls >= 3.2
Check added by commit <2d23d14>.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
m4/virt-gnutls.m4
src/util/vircrypto.c

index 35792c060f44c94993729aadaef95927fdb60a1c..8c720c0cd7516f166835965602771c0f6829e451 100644 (file)
@@ -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"
index d110adfe596ee63b47b33c70337674d6fd0c6cba..9bee04fcf90f9bf5ae30cf544bf92221e949db8f 100644 (file)
@@ -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,