Fix signed/unsigned warnings and C++ comments. Update hashes

diff --git a/fips/des/fips_desmovs.c b/fips/des/fips_desmovs.c
index c041403cbe161d820ee397d3b53013718a5065b3..93399ac65b4202fcf6da3e5b5b61cafd10630224 100644 (file)
--- a/fips/des/fips_desmovs.c
+++ b/fips/des/fips_desmovs.c
@@ -21,7 +21,7 @@
 #include <openssl/fips.h>
 #include <openssl/err.h>
 
-//#define AES_BLOCK_SIZE 16
+/*#define AES_BLOCK_SIZE 16*/
 
 #define VERBOSE 0
 
@@ -266,7 +266,7 @@ void do_mct(char *amode,
            FILE *rfp)
     {
     int i,imode;
-    unsigned char nk[16]; // double size to make the bitshift easier
+    unsigned char nk[16]; /* double size to make the bitshift easier */
 
     for (imode=0 ; imode < 6 ; ++imode)
        if(!strcmp(amode,t_mode[imode]))
@@ -309,12 +309,12 @@ void do_mct(char *amode,
            if(j == 9999)
                {
                OutputValue(t_tag[dir],text,len,rfp,imode == CFB1);
-               //              memcpy(ivec,text,8);
+               /*              memcpy(ivec,text,8); */
                }
-           //      DebugValue("iv",ctx.iv,8);
+           /*      DebugValue("iv",ctx.iv,8); */
            /* accumulate material for the next key */
            shiftin(nk,text,Sizes[imode]);
-           //      DebugValue("nk",nk,8);
+           /*      DebugValue("nk",nk,8); */
            if(imode == CFB1 || imode == CFB8 || imode == CBC)
                memcpy(text,old_iv,8);
            }

diff --git a/fips/dsa/fingerprint.sha1 b/fips/dsa/fingerprint.sha1
index 38f35e55f11e59cb7dddc8409aab1839c39d71d6..46d240844f9f6a40d596d6df7c44833ff01eb94b 100644 (file)
--- a/fips/dsa/fingerprint.sha1
+++ b/fips/dsa/fingerprint.sha1
@@ -1,2 +1,2 @@
 SHA1(fips_dsa_ossl.c)= eb769361b524507754bcbfbda92b973e37433478
-SHA1(fips_dsa_gen.c)= 2566eacc23742549865207573793f0e70e6ceb0d
+SHA1(fips_dsa_gen.c)= 07fbd4ef3c4528590265b878a05571d86312fba1

diff --git a/fips/dsa/fips_dsa_gen.c b/fips/dsa/fips_dsa_gen.c
index f85ca3e939298dee6b74c52ffd2ad0dab671111f..507c6094d6b85d1dd898094ffa1f5ca8e87f3acd 100644 (file)
--- a/fips/dsa/fips_dsa_gen.c
+++ b/fips/dsa/fips_dsa_gen.c
@@ -74,7 +74,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-//#include "cryptlib.h"
+/*#include "cryptlib.h"*/
 #include <openssl/evp.h>
 #include <openssl/bn.h>
 #include <openssl/dsa.h>

diff --git a/fips/fingerprint.sha1 b/fips/fingerprint.sha1
index 69f2032e1e2f824b12c4a2d87846fab575f08a3a..f09d87a8bad96d900aa08d767a94aed8efc08618 100644 (file)
--- a/fips/fingerprint.sha1
+++ b/fips/fingerprint.sha1
@@ -1,4 +1,4 @@
-SHA1(fips.c)= ffe435925e0c7a39ad32d0bd4a3be6b733d65aef
+SHA1(fips.c)= 98c97fbf0e3b2a7c81572804ecc65fc8a8c9cc72
 SHA1(fips_err_wrapper.c)= 0cbe881739f6e7d91308e2e74b92032e69007528
 SHA1(fips.h)= b4e3fb8a1f3aa03a63094552bedaa2c58a35cb19
 SHA1(fips_err.c)= bd28a95630f6b2e7ac17bfae872c045216611b11

diff --git a/fips/fips.c b/fips/fips.c
index d052e06ec196bf835d865fede38aefbcb6ef1a16..85514b9cd5507730ca794fdbabcf7de902441a62 100644 (file)
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -65,7 +65,7 @@ int FIPS_mode_set(int onoff)
     {
     if(onoff)
        {
-       char buf[24];
+       unsigned char buf[24];
 
        /* Don't go into FIPS mode twice, just so we can do automagic
           seeding */

diff --git a/fips/sha1/fingerprint.sha1 b/fips/sha1/fingerprint.sha1
index 67d774ef16e67a689596e4eac8eec317fb28f34e..843ce5ca30c633a1c38c26bde0d13e58038519a4 100644 (file)
--- a/fips/sha1/fingerprint.sha1
+++ b/fips/sha1/fingerprint.sha1
@@ -1,4 +1,4 @@
 SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
-SHA1(fips_sha1_selftest.c)= db50d6b2e33c87a4d9de0aab52bf1b0ad81ae2d6
+SHA1(fips_sha1_selftest.c)= 103e32b34f518cc2f6995e752644fd102cc8d602
 SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
 SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0

diff --git a/fips/sha1/fips_sha1_selftest.c b/fips/sha1/fips_sha1_selftest.c
index 730f57553ec0196fd86f3d40bcd192b1d7019707..7d2c0f2962f7c56982f47742d83722da6de831e2 100644 (file)
--- a/fips/sha1/fips_sha1_selftest.c
+++ b/fips/sha1/fips_sha1_selftest.c
@@ -78,7 +78,7 @@ int FIPS_selftest_sha1()
        {
        unsigned char md[SHA_DIGEST_LENGTH];
 
-       SHA1(test[n],strlen(test[n]),md);
+       SHA1((unsigned char*)test[n],strlen(test[n]),md);
        if(memcmp(md,ret[n],sizeof md))
            {
            FIPSerr(FIPS_F_FIPS_SELFTEST_SHA1,FIPS_R_SELFTEST_FAILED);

diff --git a/fips/sha1/standalone.sha1 b/fips/sha1/standalone.sha1
index b94676c11eb95b8432e0865a6a3a7e2d7afa4780..82be9d326df1597f3cf9ba5e66ddb7b3570a62a1 100644 (file)
--- a/fips/sha1/standalone.sha1
+++ b/fips/sha1/standalone.sha1
@@ -1,5 +1,4 @@
-SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
-SHA1(fips_sha1_selftest.c)= db50d6b2e33c87a4d9de0aab52bf1b0ad81ae2d6
 SHA1(fips_standalone_sha1.c)= bab1d8e16317a02247067f2a47722a721a4a103e
+SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
 SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
 SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0