Fix some warnings.

diff --git a/Makefile.org b/Makefile.org
index 5ec16452cc1587c6ec83a3e0c8c0b8c8048363c6..074899f3069b7333ea86ce9ee214a85e76386c71 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -5,8 +5,6 @@
 VERSION = 0.9.2b
 PLATFORM=dist
 
-# NOCONST - Define for C compilers that don't like the const key word.
-# NOPROTO - Define in if your compiler does not support prototypes.
 # RSAref  - Define if we are to link with RSAref.
 # NO_IDEA - Define to build without the IDEA algorithm
 # NO_RC4  - Define to build without the RC4 algorithm

diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c
index e66ca044e2c02539deec74aace3cdc0a6ea36ea2..06b528f64b95acef0cdb229451ce25460f8a5c7b 100644 (file)
--- a/crypto/bf/bftest.c
+++ b/crypto/bf/bftest.c
@@ -362,11 +362,11 @@ static int test(void)
                        printf("BF_encrypt error encrypting\n");
                        printf("got     :");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",data[i]);
+                               printf("%08lX ",(unsigned long)data[i]);
                        printf("\n");
                        printf("expected:");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",bf_cipher[n][i]);
+                               printf("%08lX ",(unsigned long)bf_cipher[n][i]);
                        err=1;
                        printf("\n");
                        }
@@ -377,11 +377,11 @@ static int test(void)
                        printf("BF_encrypt error decrypting\n");
                        printf("got     :");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",data[i]);
+                               printf("%08lX ",(unsigned long)data[i]);
                        printf("\n");
                        printf("expected:");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",bf_plain[n][i]);
+                               printf("%08lX ",(unsigned long)bf_plain[n][i]);
                        printf("\n");
                        err=1;
                        }

diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c
index 76373bd853ab112d1e4df8fb0d643920a35844ca..c7d52ee7343a62d1c422a9c1e09277dc8603ecd2 100644 (file)
--- a/crypto/sha/sha1dgst.c
+++ b/crypto/sha/sha1dgst.c
@@ -82,7 +82,7 @@ char *SHA1_version="SHA1" OPENSSL_VERSION_PTEXT;
 
 #ifndef NOPROTO
 #  ifdef SHA1_ASM
-     void sha1_block_x86(SHA_CTX *c, register unsigned long *p, int num);
+     void sha1_block_x86(SHA_CTX *c, register SHA_LONG *p, int num);
 #    define sha1_block sha1_block_x86
 #  else
      void sha1_block(SHA_CTX *c, register SHA_LONG *p, int num);