From 4d4dd7aea0f8890ca9dc9b9190fab2cdef9267f5 Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Sun, 3 Aug 2014 11:17:33 +0200
Subject: [PATCH] gtls: only define Curl_gtls_seed if Nettle is not being used
---
lib/vtls/gtls.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 0f9bf7b352..d64f95dcb1 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -1261,6 +1261,7 @@ size_t Curl_gtls_version(char *buffer, size_t size)
return snprintf(buffer, size, "GnuTLS/%s", gnutls_check_version(NULL));
}
+#ifndef USE_GNUTLS_NETTLE
static int Curl_gtls_seed(struct SessionHandle *data)
{
/* we have the "SSL is seeded" boolean static to prevent multiple
@@ -1268,9 +1269,7 @@ static int Curl_gtls_seed(struct SessionHandle *data)
static bool ssl_seeded = FALSE;
/* Quickly add a bit of entropy */
-#ifndef USE_GNUTLS_NETTLE
gcry_fast_random_poll();
-#endif
if(!ssl_seeded || data->set.str[STRING_SSL_RANDOM_FILE] ||
data->set.str[STRING_SSL_EGDSOCKET]) {
@@ -1284,6 +1283,7 @@ static int Curl_gtls_seed(struct SessionHandle *data)
}
return 0;
}
+#endif
/* data might be NULL! */
int Curl_gtls_random(struct SessionHandle *data,
--
GitLab