Commit c1a32376 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

parent 6b211d8c

fips/des/fips_desmovs.c

+5 −5
Original line number Diff line number Diff line
@@ -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);

	    }

fips/dsa/fingerprint.sha1

+1 −1
Original line number Diff line number Diff line 
SHA1(fips_dsa_ossl.c)= eb769361b524507754bcbfbda92b973e37433478

SHA1(fips_dsa_gen.c)= 2566eacc23742549865207573793f0e70e6ceb0d
 
SHA1(fips_dsa_gen.c)= 07fbd4ef3c4528590265b878a05571d86312fba1

fips/dsa/fips_dsa_gen.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

fips/fingerprint.sha1

+1 −1
Original line number Diff line number Diff line 
SHA1(fips.c)= ffe435925e0c7a39ad32d0bd4a3be6b733d65aef

SHA1(fips.c)= 98c97fbf0e3b2a7c81572804ecc65fc8a8c9cc72

SHA1(fips_err_wrapper.c)= 0cbe881739f6e7d91308e2e74b92032e69007528

SHA1(fips.h)= b4e3fb8a1f3aa03a63094552bedaa2c58a35cb19

SHA1(fips_err.c)= bd28a95630f6b2e7ac17bfae872c045216611b11

fips/fips.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */