summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@crystal.(none)>2008-06-30 20:13:24 +0300
committerNikos Mavrogiannopoulos <nmav@crystal.(none)>2008-06-30 20:13:24 +0300
commitaafe4eaf959240615205bec34ef2d2453f1cec6f (patch)
tree7a25f236f0df22984beb09fa7985bca01923604f
parentb4bf7c5906014dc8b946d6fad19437aaddb8b309 (diff)
downloadgnutls-aafe4eaf959240615205bec34ef2d2453f1cec6f.tar.gz
avoid using gc_ functions for random data.
-rw-r--r--src/crypt.c5
-rw-r--r--src/psk.c6
2 files changed, 5 insertions, 6 deletions
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);