X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Frand%2Frandtest.c;h=9e92a70b033c032de9e23983f1a63b9fb59d11ce;hb=49436b59b505d9e49ac06e4d544d748f78689036;hp=e0ba61e123d121dcc771f4babb635b52a8c562f9;hpb=58964a492275ca9a59a0cd9c8155cb2491b4b909;p=oweals%2Fopenssl.git

diff --git a/crypto/rand/randtest.c b/crypto/rand/randtest.c
index e0ba61e123..9e92a70b03 100644
--- a/crypto/rand/randtest.c
+++ b/crypto/rand/randtest.c
@@ -58,12 +58,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rand.h"
+#include <openssl/rand.h>
+
+#include "../e_os.h"
 
 /* some FIPS 140-1 random number test */
 /* some simple tests */
 
-int main()
+int main(int argc,char **argv)
 	{
 	unsigned char buf[2500];
 	int i,j,k,s,sign,nsign,err=0;
@@ -73,7 +75,13 @@ int main()
 	/*double d; */
 	long d;
 
-	RAND_bytes(buf,2500);
+	i = RAND_pseudo_bytes(buf,2500);
+	if (i < 0)
+		{
+		printf ("init failed, the rand method is not properly installed\n");
+		err++;
+		goto err;
+		}
 
 	n1=0;
 	for (i=0; i<16; i++) n2[i]=0;
@@ -117,7 +125,7 @@ int main()
 	/* test 1 */
 	if (!((9654 < n1) && (n1 < 10346)))
 		{
-		printf("test 1 failed, X=%ld\n",n1);
+		printf("test 1 failed, X=%lu\n",n1);
 		err++;
 		}
 	printf("test 1 done\n");
@@ -150,37 +158,37 @@ int main()
 		{
 		if (!((2267 < runs[i][0]) && (runs[i][0] < 2733)))
 			{
-			printf("test 3 failed, bit=%d run=%d num=%ld\n",
+			printf("test 3 failed, bit=%d run=%d num=%lu\n",
 				i,1,runs[i][0]);
 			err++;
 			}
 		if (!((1079 < runs[i][1]) && (runs[i][1] < 1421)))
 			{
-			printf("test 3 failed, bit=%d run=%d num=%ld\n",
+			printf("test 3 failed, bit=%d run=%d num=%lu\n",
 				i,2,runs[i][1]);
 			err++;
 			}
 		if (!(( 502 < runs[i][2]) && (runs[i][2] <  748)))
 			{
-			printf("test 3 failed, bit=%d run=%d num=%ld\n",
+			printf("test 3 failed, bit=%d run=%d num=%lu\n",
 				i,3,runs[i][2]);
 			err++;
 			}
 		if (!(( 223 < runs[i][3]) && (runs[i][3] <  402)))
 			{
-			printf("test 3 failed, bit=%d run=%d num=%ld\n",
+			printf("test 3 failed, bit=%d run=%d num=%lu\n",
 				i,4,runs[i][3]);
 			err++;
 			}
 		if (!((  90 < runs[i][4]) && (runs[i][4] <  223)))
 			{
-			printf("test 3 failed, bit=%d run=%d num=%ld\n",
+			printf("test 3 failed, bit=%d run=%d num=%lu\n",
 				i,5,runs[i][4]);
 			err++;
 			}
 		if (!((  90 < runs[i][5]) && (runs[i][5] <  223)))
 			{
-			printf("test 3 failed, bit=%d run=%d num=%ld\n",
+			printf("test 3 failed, bit=%d run=%d num=%lu\n",
 				i,6,runs[i][5]);
 			err++;
 			}
@@ -190,18 +198,22 @@ int main()
 	/* test 4 */
 	if (runs[0][33] != 0)
 		{
-		printf("test 4 failed, bit=%d run=%d num=%ld\n",
+		printf("test 4 failed, bit=%d run=%d num=%lu\n",
 			0,34,runs[0][33]);
 		err++;
 		}
 	if (runs[1][33] != 0)
 		{
-		printf("test 4 failed, bit=%d run=%d num=%ld\n",
+		printf("test 4 failed, bit=%d run=%d num=%lu\n",
 			1,34,runs[1][33]);
 		err++;
 		}
 	printf("test 4 done\n");
+ err:
 	err=((err)?1:0);
-	exit(err);
+#ifdef OPENSSL_SYS_NETWARE
+    if (err) printf("ERROR: %d\n", err);
+#endif
+	EXIT(err);
 	return(err);
 	}