wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dr. Stephen Henson 2003-09-05 13:00:34 +00:00
parent 6b211d8cd2
commit c1a32376db
8 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fips/des/fips_desmovs.c
View file

@ -21,7 +21,7 @@
#include <openssl/fips.h> #include <openssl/fips.h>
#include <openssl/err.h> #include <openssl/err.h>
//#define AES_BLOCK_SIZE 16 /*#define AES_BLOCK_SIZE 16*/
#define VERBOSE 0 #define VERBOSE 0
@ -266,7 +266,7 @@ void do_mct(char *amode,
FILE *rfp) FILE *rfp)
{ {
int i,imode; 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) for (imode=0 ; imode < 6 ; ++imode)
if(!strcmp(amode,t_mode[imode])) if(!strcmp(amode,t_mode[imode]))
@ -309,12 +309,12 @@ void do_mct(char *amode,
if(j == 9999) if(j == 9999)
{ {
OutputValue(t_tag[dir],text,len,rfp,imode == CFB1); 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 */ /* accumulate material for the next key */
shiftin(nk,text,Sizes[imode]); shiftin(nk,text,Sizes[imode]);
// DebugValue("nk",nk,8); /* DebugValue("nk",nk,8); */
if(imode == CFB1 || imode == CFB8 || imode == CBC) if(imode == CFB1 || imode == CFB8 || imode == CBC)
memcpy(text,old_iv,8); memcpy(text,old_iv,8);
} }

2
fips/dsa/fingerprint.sha1
View file

@ -1,2 +1,2 @@
SHA1(fips_dsa_ossl.c)= eb769361b524507754bcbfbda92b973e37433478 SHA1(fips_dsa_ossl.c)= eb769361b524507754bcbfbda92b973e37433478
SHA1(fips_dsa_gen.c)= 2566eacc23742549865207573793f0e70e6ceb0d SHA1(fips_dsa_gen.c)= 07fbd4ef3c4528590265b878a05571d86312fba1

2
fips/dsa/fips_dsa_gen.c
View file

@ -74,7 +74,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
//#include "cryptlib.h" /*#include "cryptlib.h"*/
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/dsa.h> #include <openssl/dsa.h>

2
fips/fingerprint.sha1
View file

@ -1,4 +1,4 @@
SHA1(fips.c)= ffe435925e0c7a39ad32d0bd4a3be6b733d65aef SHA1(fips.c)= 98c97fbf0e3b2a7c81572804ecc65fc8a8c9cc72
SHA1(fips_err_wrapper.c)= 0cbe881739f6e7d91308e2e74b92032e69007528 SHA1(fips_err_wrapper.c)= 0cbe881739f6e7d91308e2e74b92032e69007528
SHA1(fips.h)= b4e3fb8a1f3aa03a63094552bedaa2c58a35cb19 SHA1(fips.h)= b4e3fb8a1f3aa03a63094552bedaa2c58a35cb19
SHA1(fips_err.c)= bd28a95630f6b2e7ac17bfae872c045216611b11 SHA1(fips_err.c)= bd28a95630f6b2e7ac17bfae872c045216611b11

2
fips/fips.c
View file

@ -65,7 +65,7 @@ int FIPS_mode_set(int onoff)
{ {
if(onoff) if(onoff)
{ {
char buf[24]; unsigned char buf[24];
/* Don't go into FIPS mode twice, just so we can do automagic /* Don't go into FIPS mode twice, just so we can do automagic
seeding */ seeding */

2
fips/sha1/fingerprint.sha1
View file

@ -1,4 +1,4 @@
SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5 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_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0 SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0

2
fips/sha1/fips_sha1_selftest.c
View file

@ -78,7 +78,7 @@ int FIPS_selftest_sha1()
{ {
unsigned char md[SHA_DIGEST_LENGTH]; 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)) if(memcmp(md,ret[n],sizeof md))
{ {
FIPSerr(FIPS_F_FIPS_SELFTEST_SHA1,FIPS_R_SELFTEST_FAILED); FIPSerr(FIPS_F_FIPS_SELFTEST_SHA1,FIPS_R_SELFTEST_FAILED);

3
fips/sha1/standalone.sha1
View file

@ -1,5 +1,4 @@
SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
SHA1(fips_sha1_selftest.c)= db50d6b2e33c87a4d9de0aab52bf1b0ad81ae2d6
SHA1(fips_standalone_sha1.c)= bab1d8e16317a02247067f2a47722a721a4a103e SHA1(fips_standalone_sha1.c)= bab1d8e16317a02247067f2a47722a721a4a103e
SHA1(fips_sha1dgst.c)= 609e2cbf5d3cdcf318ec10238a0e82b93b78e6b5
SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c SHA1(fips_sha_locl.h)= 677427c495b571991f013939ea7e5dea87828f8c
SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0 SHA1(fips_md32_common.h)= 4f41bcde24750b3b8c99a06bcba2fe06ff8db4d0