security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

Merged in my changes, after disk crash. Fortunately the CVS was not

Browse source 
affected - but everything else and it seems that there is no backup of
the BTS data is available :-(
This commit is contained in:
Werner Koch 2002-04-08 15:10:51 +00:00
parent 6be3bee320
commit b725d8ec27
47 changed files with 7477 additions and 7394 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cipher/ChangeLog
View file

@ -1,3 +1,10 @@
2002-04-06 Werner Koch <wk@gnupg.org>
* rijndael.c (rijndael_get_info): We do only support a 128 bit
blocksize so it makes sense to change the algorithm strings to
AES.
* cipher.c (string_to_cipher_algo): Map "RIJNDAEL" to "AES".
2002-02-14 Werner Koch <wk@gnupg.org>
* random.c (mix_pool): Removed the failsafe stuff again. It makes

28
cipher/cipher.c
View file

@ -253,15 +253,29 @@ load_cipher_modules(void)
int
string_to_cipher_algo( const char *string )
{
int i;
const char *s;
int i;
const char *s;
do {
for(i=0; (s=cipher_table[i].name); i++ )
if( !ascii_strcasecmp( s, string ) )
return cipher_table[i].algo;
/* kludge to alias RIJNDAEL to AES */
if ( *string == 'R' || *string == 'r')
{
if (!ascii_strcasecmp (string, "RIJNDAEL"))
string = "AES";
else if (!ascii_strcasecmp (string, "RIJNDAEL192"))
string = "AES192";
else if (!ascii_strcasecmp (string, "RIJNDAEL256"))
string = "AES256";
}
do
{
for(i=0; (s=cipher_table[i].name); i++ )
{
if( !ascii_strcasecmp( s, string ) )
return cipher_table[i].algo;
}
} while( load_cipher_modules() );
return 0;
return 0;
}
/****************

6
cipher/rijndael.c
View file

@ -2151,11 +2151,11 @@ rijndael_get_info (int algo, size_t *keylen,
= rijndael_decrypt;
if( algo == 7 )
return "RIJNDAEL";
return "AES";
if (algo == 8)
return "RIJNDAEL192";
return "AES192";
if (algo == 9)
return "RIJNDAEL256";
return "AES256";
return NULL;
}