mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
* cipher.c (string_to_cipher_algo), md.c (string_to_digest_algo): Allow
the Sxxx and Hxxx format for cipher and digest names.
This commit is contained in:
parent
bdf0e306df
commit
d6693c144c
@ -1,3 +1,8 @@
|
||||
2002-11-02 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* cipher.c (string_to_cipher_algo), md.c (string_to_digest_algo):
|
||||
Allow the Sxxx and Hxxx format for cipher and digest names.
|
||||
|
||||
2002-10-31 Stefan Bellon <sbellon@sbellon.de>
|
||||
|
||||
* rndriscos.c (rndriscos_gather_random): Use riscos_load_module()
|
||||
|
@ -211,12 +211,6 @@ load_cipher_modules(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/****************
|
||||
* Map a string to the cipher algo
|
||||
*/
|
||||
@ -245,6 +239,20 @@ string_to_cipher_algo( const char *string )
|
||||
return cipher_table[i].algo;
|
||||
}
|
||||
} while( load_cipher_modules() );
|
||||
|
||||
/* Didn't find it, so try the Sx format */
|
||||
if(string[0]=='S' || string[0]=='s')
|
||||
{
|
||||
long val;
|
||||
char *endptr;
|
||||
|
||||
string++;
|
||||
|
||||
val=strtol(string,&endptr,10);
|
||||
if(*string!='\0' && *endptr=='\0' && check_cipher_algo(val)==0)
|
||||
return val;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -675,4 +683,3 @@ cipher_sync( CIPHER_HANDLE c )
|
||||
c->unused = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
15
cipher/md.c
15
cipher/md.c
@ -120,10 +120,23 @@ string_to_digest_algo( const char *string )
|
||||
if( !ascii_strcasecmp( r->name, string ) )
|
||||
return r->algo;
|
||||
} while( !r && load_digest_module () );
|
||||
|
||||
/* Didn't find it, so try the Hx format */
|
||||
if(string[0]=='H' || string[0]=='h')
|
||||
{
|
||||
long val;
|
||||
char *endptr;
|
||||
|
||||
string++;
|
||||
|
||||
val=strtol(string,&endptr,10);
|
||||
if(*string!='\0' && *endptr=='\0' && check_digest_algo(val)==0)
|
||||
return val;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/****************
|
||||
* Map a digest algo to a string
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user