From: Nikos Mavrogiannopoulos <nmav@crystal.(none)>
Date: Mon, 30 Jun 2008 17:13:24 +0000 (+0300)
Subject: avoid using gc_ functions for random data.
X-Git-Tag: gnutls_2_5_0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aafe4eaf959240615205bec34ef2d2453f1cec6f;p=thirdparty%2Fgnutls.git

avoid using gc_ functions for random data.
---

diff --git a/src/crypt.c b/src/crypt.c
index 27ac16faa7..cb982b08fe 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -48,8 +48,7 @@ srptool_version (void)
 #include <gnutls/gnutls.h>
 #include <gnutls/extra.h>
 #include <crypt-gaa.h>
-
-#include <gc.h>			/* for randomize */
+#include "../lib/random.h" /* for random */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -507,7 +506,7 @@ _srp_crypt (const char *username, const char *passwd, int salt_size,
 
   /* generate the salt
    */
-  if (gc_nonce (salt, salt_size) != GC_OK)
+  if (_gnutls_rnd (RND_NONCE, salt, salt_size) < 0)
     {
       fprintf (stderr, "Could not create nonce\n");
       return NULL;
diff --git a/src/psk.c b/src/psk.c
index d4bc5ea1fe..5e6376cc56 100644
--- a/src/psk.c
+++ b/src/psk.c
@@ -48,7 +48,7 @@ psktool_version (void)
 #include <gnutls/extra.h>
 #include <psk-gaa.h>
 
-#include <gc.h>			/* for randomize */
+#include "../lib/random.h" /* for random */
 #include "getpass.h"
 
 #include <sys/types.h>
@@ -158,8 +158,8 @@ main (int argc, char **argv)
 
       printf ("Generating a random key for user '%s'\n", info.username);
 
-      ret = gc_pseudo_random ((char *) key, info.key_size);
-      if (ret != GC_OK)
+      ret = _gnutls_rnd (RND_RANDOM, (char*)key, info.key_size);
+      if (ret < 0)
 	{
 	  fprintf (stderr, "Not enough randomness\n");
 	  exit (1);