updated prng test

diff --git a/tests/suite/rng.c b/tests/suite/rng.c
index 7396c8c71920d52b5eda6580f768871d7dcfa4a0..019bd8730c7a69a0979ca660bdaf3d285f5373fe 100644 (file)
--- a/tests/suite/rng.c
+++ b/tests/suite/rng.c
@@ -41,15 +41,16 @@ int main(int argc, char **argv)
        gnutls_global_init();
 
        if (argc != 4) {
-               fprintf(stderr, "usage: %s [nonce|key] [nbytes] [outfile]\n", argv[0]);
+               fprintf(stderr, "args %d\nusage: %s [nonce|key] [nbytes] [outfile]\n", argc, argv[0]);
                exit(1);
        }
 
-       if (strcasecmp(argv[1], "nonce")) {
+       if (strcasecmp(argv[1], "nonce") == 0) {
                level = GNUTLS_RND_NONCE;
-       } else if (strcasecmp(argv[1], "key")) {
+       } else if (strcasecmp(argv[1], "key") == 0) {
                level = GNUTLS_RND_KEY;
        } else {
+               fprintf(stderr, "don't know %s\n", argv[1]);
                fprintf(stderr, "usage: %s [nonce|key] [nbytes] [outfile]\n", argv[0]);
                exit(1);
        }

diff --git a/tests/suite/testrng b/tests/suite/testrng
index 07b009dbf91b05685a3ce838b075db8e50c8bb56..e49432e757b0d3289fb5fddcb88f7c20a62436bf 100755 (executable)
--- a/tests/suite/testrng
+++ b/tests/suite/testrng
@@ -32,10 +32,12 @@ else
 fi
 
 OUTFILE=rng.log
-RNGFILE=rng.rng
+RNGFILE=rng.out
+RNGFILE2=rng2.out
 
 rm -f $OUTFILE
 rm -f $RNGFILE
+rm -f $RNGFILE2
 
 . $srcdir/../scripts/common.sh
 
@@ -48,6 +50,16 @@ fi
 
 echo "Testing nonce PRNG"
 
+./rng nonce 64 $RNGFILE
+./rng nonce 64 $RNGFILE2
+cmp $RNGFILE $RNGFILE2  >/dev/null 2>&1
+ret=$?
+
+if test $ret = 0;then
+       echo "numbers are repeated in nonce!"
+       exit 1
+fi
+
 ./rng nonce 100000000 $RNGFILE
 
 dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
@@ -72,6 +84,17 @@ fi
 
 rm -f $OUTFILE
 echo "Testing key PRNG"
+
+./rng key 64 $RNGFILE
+./rng key 64 $RNGFILE2
+cmp $RNGFILE $RNGFILE2 >/dev/null 2>&1
+ret=$?
+
+if test $ret = 0;then
+       echo "numbers are repeated in nonce!"
+       exit 1
+fi
+
 ./rng key 100000000 $RNGFILE
 
 dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
@@ -121,5 +144,6 @@ fi
 
 rm -f $OUTFILE
 rm -f $RNGFILE
+rm -f $RNGFILE2
 
 exit 0