[wpdev-commits] wolfpack/twofish aes.h,1.6,1.7

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/wolfpack/twofish
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14349/twofish

Modified Files:
	aes.h 
Log Message:
I actually fixed most of the conversion warnings, and Wolfpack didn't break for me... so I'll commit. This removes quite a bit of warning garbage. :)


Index: aes.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/twofish/aes.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** aes.h	12 Aug 2004 12:13:33 -0000	1.6
--- aes.h	13 Aug 2004 08:55:42 -0000	1.7
***************
*** 11,15 ****
  Cryptographic API Profile for AES Candidate Algorithm Submissions.
  Please consult this document as a cross-reference.
! 	
  	ANY CHANGES, WHERE APPROPRIATE, TO INFORMATION PROVIDED IN THIS FILE
  MUST BE DOCUMENTED. CHANGES ARE ONLY APPROPRIATE WHERE SPECIFIED WITH
--- 11,15 ----
  Cryptographic API Profile for AES Candidate Algorithm Submissions.
  Please consult this document as a cross-reference.
! 
  	ANY CHANGES, WHERE APPROPRIATE, TO INFORMATION PROVIDED IN THIS FILE
  MUST BE DOCUMENTED. CHANGES ARE ONLY APPROPRIATE WHERE SPECIFIED WITH
***************
*** 171,175 ****
  keyMaterial parameter to NULL.  Then use reKey() for all key changes.
  Similarly, cipherInit takes an IV string in ASCII hex, so a dummy setup
! call with a null IV string will skip the ASCII parse.  
  
  Note that CFB mode is not well tested nor defined by AES, so using the
--- 171,175 ----
  keyMaterial parameter to NULL.  Then use reKey() for all key changes.
  Similarly, cipherInit takes an IV string in ASCII hex, so a dummy setup
! call with a null IV string will skip the ASCII parse.
  
  Note that CFB mode is not well tested nor defined by AES, so using the
***************
*** 241,249 ****
  
  	if ( blockDecrypt( &ci, &ki, cipherText, byteCnt * 8, decryptOut ) != byteCnt * 8 )
! 		return 1;				
  
  	/* make sure the decrypt output matches original plaintext */
  	if ( memcmp( plainText, decryptOut, byteCnt ) )
! 		return 1;		
  
  	return 0;					/* tests passed! */
--- 241,249 ----
  
  	if ( blockDecrypt( &ci, &ki, cipherText, byteCnt * 8, decryptOut ) != byteCnt * 8 )
! 		return 1;
  
  	/* make sure the decrypt output matches original plaintext */
  	if ( memcmp( plainText, decryptOut, byteCnt ) )
! 		return 1;
  
  	return 0;					/* tests passed! */
***************
*** 270,272 ****
  	printf( "Tests passed" );
  }
! #endif /* TEST_2FISH */
\ No newline at end of file
--- 270,272 ----
  	printf( "Tests passed" );
  }
! #endif /* TEST_2FISH */