OpenSSL 0.9.4 merge

6 files changed, 235 insertions, 96 deletions

diff --git a/src/lib/libcrypto/rand/Makefile.ssl b/src/lib/libcrypto/rand/Makefile.ssl
index d04f0a9b43..76bfdfeae5 100644
--- a/src/lib/libcrypto/rand/Makefile.ssl
+++ b/src/lib/libcrypto/rand/Makefile.ssl
@@ -7,9 +7,11 @@ TOP=	../..
 CC=     cc
 INCLUDES=
 CFLAG=-g
+INSTALL_PREFIX=
+OPENSSLDIR=     /usr/local/ssl
 INSTALLTOP=/usr/local/ssl
 MAKE=           make -f Makefile.ssl
-MAKEDEPEND=     makedepend -f Makefile.ssl
+MAKEDEPEND=     $(TOP)/util/domd $(TOP)
 MAKEFILE=       Makefile.ssl
 AR=             ar r
 
@@ -20,8 +22,8 @@ TEST= randtest.c
 APPS=
 
 LIB=$(TOP)/libcrypto.a
-LIBSRC=md_rand.c randfile.c
-LIBOBJ=md_rand.o randfile.o
+LIBSRC=md_rand.c randfile.c rand_lib.c
+LIBOBJ=md_rand.o randfile.o rand_lib.o
 
 SRC= $(LIBSRC)
 
@@ -37,24 +39,23 @@ all:	lib
 
 lib:    $(LIBOBJ)
         $(AR) $(LIB) $(LIBOBJ)
-        sh $(TOP)/util/ranlib.sh $(LIB)
+        $(RANLIB) $(LIB)
         @touch lib
 
 files:
-        perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
+        $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
 
 links:
-        /bin/rm -f Makefile
-        $(TOP)/util/point.sh Makefile.ssl Makefile ;
-        $(TOP)/util/mklink.sh ../../include $(EXHEADER)
-        $(TOP)/util/mklink.sh ../../test $(TEST)
-        $(TOP)/util/mklink.sh ../../apps $(APPS)
+        @$(TOP)/util/point.sh Makefile.ssl Makefile
+        @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER)
+        @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST)
+        @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS)
 
 install:
         @for i in $(EXHEADER) ; \
         do  \
-        (cp $$i $(INSTALLTOP)/include/$$i; \
-        chmod 644 $(INSTALLTOP)/include/$$i ); \
+        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
         done;
 
 tags:
@@ -66,15 +67,21 @@ lint:
         lint -DLINT $(INCLUDES) $(SRC)>fluff
 
 depend:
-        $(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
+        $(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
 
 dclean:
-        perl -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
+        $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
         mv -f Makefile.new $(MAKEFILE)
 
 clean:
-        /bin/rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
-
-errors:
+        rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
+
+md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os.h
+md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
+md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
+md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
+rand_lib.o: ../../include/openssl/rand.h
+randfile.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
+randfile.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
diff --git a/src/lib/libcrypto/rand/md_rand.c b/src/lib/libcrypto/rand/md_rand.c
index f44b36a8b9..6bd1960e1d 100644
--- a/src/lib/libcrypto/rand/md_rand.c
+++ b/src/lib/libcrypto/rand/md_rand.c
@@ -57,21 +57,25 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
 #include <sys/types.h>
 #include <time.h>
+#include <string.h>
+
+#include "openssl/e_os.h"
+
+#include <openssl/crypto.h>
 
 #if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
-#ifndef NO_MD5
-#define USE_MD5_RAND
-#elif !defined(NO_SHA1)
+#if !defined(NO_SHA) && !defined(NO_SHA1)
 #define USE_SHA1_RAND
-#elif !defined(NO_MDC2)
+#elif !defined(NO_MD5)
+#define USE_MD5_RAND
+#elif !defined(NO_MDC2) && !defined(NO_DES)
 #define USE_MDC2_RAND
 #elif !defined(NO_MD2)
 #define USE_MD2_RAND
 #else
-We need a message digest of some type 
+#error No message digest algorithm available
 #endif
 #endif
 
@@ -82,60 +86,78 @@ We need a message digest of some type
  */
 
 #if defined(USE_MD5_RAND)
-#include "md5.h"
+#include <openssl/md5.h>
 #define MD_DIGEST_LENGTH        MD5_DIGEST_LENGTH
 #define MD_CTX                  MD5_CTX
 #define MD_Init(a)              MD5_Init(a)
 #define MD_Update(a,b,c)        MD5_Update(a,b,c)
 #define MD_Final(a,b)           MD5_Final(a,b)
+#define MD(a,b,c)               MD5(a,b,c)
 #elif defined(USE_SHA1_RAND)
-#include "sha.h"
+#include <openssl/sha.h>
 #define MD_DIGEST_LENGTH        SHA_DIGEST_LENGTH
 #define MD_CTX                  SHA_CTX
 #define MD_Init(a)              SHA1_Init(a)
 #define MD_Update(a,b,c)        SHA1_Update(a,b,c)
 #define MD_Final(a,b)           SHA1_Final(a,b)
+#define MD(a,b,c)               SHA1(a,b,c)
 #elif defined(USE_MDC2_RAND)
-#include "mdc2.h"
+#include <openssl/mdc2.h>
 #define MD_DIGEST_LENGTH        MDC2_DIGEST_LENGTH
 #define MD_CTX                  MDC2_CTX
 #define MD_Init(a)              MDC2_Init(a)
 #define MD_Update(a,b,c)        MDC2_Update(a,b,c)
 #define MD_Final(a,b)           MDC2_Final(a,b)
+#define MD(a,b,c)               MDC2(a,b,c)
 #elif defined(USE_MD2_RAND)
-#include "md2.h"
+#include <openssl/md2.h>
 #define MD_DIGEST_LENGTH        MD2_DIGEST_LENGTH
 #define MD_CTX                  MD2_CTX
 #define MD_Init(a)              MD2_Init(a)
 #define MD_Update(a,b,c)        MD2_Update(a,b,c)
 #define MD_Final(a,b)           MD2_Final(a,b)
+#define MD(a,b,c)               MD2(a,b,c)
 #endif
 
-#include "rand.h"
+#include <openssl/rand.h>
 
-/*#define NORAND        1 */
-/*#define PREDICT       1 */
+/* #define NORAND       1 */
+/* #define PREDICT      1 */
 
 #define STATE_SIZE      1023
 static int state_num=0,state_index=0;
 static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH];
 static unsigned char md[MD_DIGEST_LENGTH];
-static int md_count=0;
+static long md_count[2]={0,0};
+
+const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT;
+
+static void ssleay_rand_cleanup(void);
+static void ssleay_rand_seed(const void *buf, int num);
+static void ssleay_rand_bytes(unsigned char *buf, int num);
 
-char *RAND_version="RAND part of SSLeay 0.9.0b 29-Jun-1998";
+RAND_METHOD rand_ssleay_meth={
+        ssleay_rand_seed,
+        ssleay_rand_bytes,
+        ssleay_rand_cleanup,
+        }; 
 
-void RAND_cleanup()
+RAND_METHOD *RAND_SSLeay(void)
+        {
+        return(&rand_ssleay_meth);
+        }
+
+static void ssleay_rand_cleanup(void)
         {
         memset(state,0,sizeof(state));
         state_num=0;
         state_index=0;
         memset(md,0,MD_DIGEST_LENGTH);
-        md_count=0;
+        md_count[0]=0;
+        md_count[1]=0;
         }
 
-void RAND_seed(buf,num)
-unsigned char *buf;
-int num;
+static void ssleay_rand_seed(const void *buf, int num)
         {
         int i,j,k,st_idx,st_num;
         MD_CTX m;
@@ -178,9 +200,11 @@ int num;
                         MD_Update(&m,&(state[st_idx]),j);
                         
                 MD_Update(&m,buf,j);
+                MD_Update(&m,(unsigned char *)&(md_count[0]),sizeof(md_count));
                 MD_Final(md,&m);
+                md_count[1]++;
 
-                buf+=j;
+                buf=(const char *)buf + j;
 
                 for (k=0; k<j; k++)
                         {
@@ -195,9 +219,7 @@ int num;
         memset((char *)&m,0,sizeof(m));
         }
 
-void RAND_bytes(buf,num)
-unsigned char *buf;
-int num;
+static void ssleay_rand_bytes(unsigned char *buf, int num)
         {
         int i,j,k,st_num,st_idx;
         MD_CTX m;
@@ -221,19 +243,18 @@ int num;
 
         if (init)
                 {
-                init=0;
                 CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
                 /* put in some default random data, we need more than
                  * just this */
-                RAND_seed((unsigned char *)&m,sizeof(m));
+                RAND_seed(&m,sizeof(m));
 #ifndef MSDOS
                 l=getpid();
-                RAND_seed((unsigned char *)&l,sizeof(l));
+                RAND_seed(&l,sizeof(l));
                 l=getuid();
-                RAND_seed((unsigned char *)&l,sizeof(l));
+                RAND_seed(&l,sizeof(l));
 #endif
                 l=time(NULL);
-                RAND_seed((unsigned char *)&l,sizeof(l));
+                RAND_seed(&l,sizeof(l));
 
 /* #ifdef DEVRANDOM */
                 /* 
@@ -261,6 +282,7 @@ int num;
                 memset(md,0,MD_DIGEST_LENGTH);
 #endif
                 CRYPTO_w_lock(CRYPTO_LOCK_RAND);
+                init=0;
                 }
 
         st_idx=state_index;
@@ -277,6 +299,7 @@ int num;
                 num-=j;
                 MD_Init(&m);
                 MD_Update(&m,&(md[MD_DIGEST_LENGTH/2]),MD_DIGEST_LENGTH/2);
+                MD_Update(&m,(unsigned char *)&(md_count[0]),sizeof(md_count));
 #ifndef PURIFY
                 MD_Update(&m,buf,j); /* purify complains */
 #endif
@@ -300,7 +323,8 @@ int num;
                 }
 
         MD_Init(&m);
-        MD_Update(&m,(unsigned char *)&md_count,sizeof(md_count)); md_count++;
+        MD_Update(&m,(unsigned char *)&(md_count[0]),sizeof(md_count));
+        md_count[0]++;
         MD_Update(&m,md,MD_DIGEST_LENGTH);
         MD_Final(md,&m);
         memset(&m,0,sizeof(m));
@@ -308,7 +332,7 @@ int num;
 
 #ifdef WINDOWS
 #include <windows.h>
-#include <rand.h>
+#include <openssl/rand.h>
 
 /*****************************************************************************
  * Initialisation function for the SSL random generator.  Takes the contents
@@ -320,13 +344,13 @@ int num;
  * <URL:http://www.microsoft.com/kb/developr/win_dk/q97193.htm>;
  * the original copyright message is:
  *
-//   (C) Copyright Microsoft Corp. 1993.  All rights reserved.
-//
-//   You have a royalty-free right to use, modify, reproduce and
-//   distribute the Sample Files (and/or any modified version) in
-//   any way you find useful, provided that you agree that
-//   Microsoft has no warranty obligations or liability for any
-//   Sample Application Files which are modified.
+ *   (C) Copyright Microsoft Corp. 1993.  All rights reserved.
+ *
+ *   You have a royalty-free right to use, modify, reproduce and
+ *   distribute the Sample Files (and/or any modified version) in
+ *   any way you find useful, provided that you agree that
+ *   Microsoft has no warranty obligations or liability for any
+ *   Sample Application Files which are modified.
  */
 /*
  * I have modified the loading of bytes via RAND_seed() mechanism since
@@ -385,7 +409,7 @@ void RAND_screen(void)
         GetBitmapBits(hBitmap, size, bmbits);
 
         /* Get the MD5 of the bitmap */
-        MD5(bmbits,size,md);
+        MD(bmbits,size,md);
 
         /* Seed the random generator with the MD5 digest */
         RAND_seed(md, MD_DIGEST_LENGTH);
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h
index 477d7a150a..fd8ee38366 100644
--- a/src/lib/libcrypto/rand/rand.h
+++ b/src/lib/libcrypto/rand/rand.h
@@ -63,28 +63,25 @@
 extern "C" {
 #endif
 
-#ifndef NOPROTO
+typedef struct rand_meth_st
+        {
+        void (*seed)(const void *buf, int num);
+        void (*bytes)(unsigned char *buf, int num);
+        void (*cleanup)(void);
+        } RAND_METHOD;
+
+void RAND_set_rand_method(RAND_METHOD *meth);
+RAND_METHOD *RAND_get_rand_method(void );
+RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void );
-void RAND_bytes( unsigned char *buf,int num);
-void RAND_seed( unsigned char *buf,int num);
-int  RAND_load_file(char *file,long max_bytes);
-int  RAND_write_file(char *file);
+void RAND_bytes(unsigned char *buf,int num);
+void RAND_seed(const void *buf,int num);
+int  RAND_load_file(const char *file,long max_bytes);
+int  RAND_write_file(const char *file);
 char *RAND_file_name(char *file,int num);
 #ifdef WINDOWS
 void RAND_screen(void);
 #endif
-#else
-void RAND_cleanup();
-void RAND_bytes();
-void RAND_seed();
-int  RAND_load_file();
-int  RAND_write_file();
-char *RAND_file_name();
-#ifdef WINDOWS
-void RAND_screen();
-#endif
-#endif
-
 #ifdef  __cplusplus
 }
 #endif
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c
new file mode 100644
index 0000000000..34c6d5b968
--- /dev/null
+++ b/src/lib/libcrypto/rand/rand_lib.c
@@ -0,0 +1,98 @@
+/* crypto/rand/rand_lib.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <time.h>
+#include <openssl/rand.h>
+
+#ifdef NO_RAND
+static RAND_METHOD *rand_meth=NULL;
+#else
+extern RAND_METHOD rand_ssleay_meth;
+static RAND_METHOD *rand_meth= &rand_ssleay_meth;
+#endif
+
+void RAND_set_rand_method(RAND_METHOD *meth)
+        {
+        rand_meth=meth;
+        }
+
+RAND_METHOD *RAND_get_rand_method(void)
+        {
+        return(rand_meth);
+        }
+
+void RAND_cleanup(void)
+        {
+        if (rand_meth != NULL)
+                rand_meth->cleanup();
+        }
+
+void RAND_seed(const void *buf, int num)
+        {
+        if (rand_meth != NULL)
+                rand_meth->seed(buf,num);
+        }
+
+void RAND_bytes(unsigned char *buf, int num)
+        {
+        if (rand_meth != NULL)
+                rand_meth->bytes(buf,num);
+        }
+
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index f2b3746363..6829d4ec37 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -56,11 +56,17 @@
  * [including the GNU Public Licence.]
  */
 
+#include <errno.h>
 #include <stdio.h>
-#include "cryptlib.h"
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "rand.h"
+
+#include "openssl/e_os.h"
+
+#include <openssl/rand.h>
 
 #undef BUFSIZE
 #define BUFSIZE 1024
@@ -68,9 +74,7 @@
 
 /* #define RFILE ".rand" - defined in ../../e_os.h */
 
-int RAND_load_file(file,bytes)
-char *file;
-long bytes;
+int RAND_load_file(const char *file, long bytes)
         {
         MS_STATIC unsigned char buf[BUFSIZE];
         struct stat sb;
@@ -81,12 +85,12 @@ long bytes;
 
         i=stat(file,&sb);
         /* If the state fails, put some crap in anyway */
-        RAND_seed((unsigned char *)&sb,sizeof(sb));
+        RAND_seed(&sb,sizeof(sb));
         ret+=sizeof(sb);
         if (i < 0) return(0);
         if (bytes <= 0) return(ret);
 
-        in=fopen(file,"r");
+        in=fopen(file,"rb");
         if (in == NULL) goto err;
         for (;;)
                 {
@@ -105,15 +109,24 @@ err:
         return(ret);
         }
 
-int RAND_write_file(file)
-char *file;
+int RAND_write_file(const char *file)
         {
         unsigned char buf[BUFSIZE];
         int i,ret=0;
         FILE *out;
         int n;
 
-        out=fopen(file,"w");
+        /* Under VMS, fopen(file, "wb") will craete a new version of the
+           same file.  This is not good, so let's try updating an existing
+           one, and create file only if it doesn't already exist.  This
+           should be completely harmless on system that have no file
+           versions.                                    -- Richard Levitte */
+        out=fopen(file,"rb+");
+        if (out == NULL && errno == ENOENT)
+                {
+                errno = 0;
+                out=fopen(file,"wb");
+                }
         if (out == NULL) goto err;
         chmod(file,0600);
         n=RAND_DATA;
@@ -137,9 +150,7 @@ err:
         return(ret);
         }
 
-char *RAND_file_name(buf,size)
-char *buf;
-int size;
+char *RAND_file_name(char *buf, int size)
         {
         char *s;
         char *ret=NULL;
@@ -158,7 +169,9 @@ int size;
                 if (((int)(strlen(s)+strlen(RFILE)+2)) > size)
                         return(RFILE);
                 strcpy(buf,s);
+#ifndef VMS
                 strcat(buf,"/");
+#endif
                 strcat(buf,RFILE);
                 ret=buf;
                 }
diff --git a/src/lib/libcrypto/rand/randtest.c b/src/lib/libcrypto/rand/randtest.c
index e0ba61e123..f0706d779a 100644
--- a/src/lib/libcrypto/rand/randtest.c
+++ b/src/lib/libcrypto/rand/randtest.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "rand.h"
+#include <openssl/rand.h>
 
 /* some FIPS 140-1 random number test */
 /* some simple tests */
@@ -117,7 +117,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 +150,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,13 +190,13 @@ 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++;
                 }