security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

* g10.c (main): Accept "s1" in addition to "idea" to match the other

Browse Source 
ciphers.

* main.h, misc.c (idea_cipher_warn): We don't need this if IDEA has been
disabled.
This commit is contained in:
David Shaw 2003-02-22 13:00:18 +00:00
parent 874fc78920
commit 6f41d06841
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -1,3 +1,11 @@
2003-02-22 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): Accept "s1" in addition to "idea" to match the
other ciphers.
* main.h, misc.c (idea_cipher_warn): We don't need this if IDEA
has been disabled.
2003-02-21 David Shaw <dshaw@jabberwocky.com> 2003-02-21 David Shaw <dshaw@jabberwocky.com>
* keygen.c (keygen_set_std_prefs): Don't put AES or CAST5 in * keygen.c (keygen_set_std_prefs): Don't put AES or CAST5 in

3
g10/g10.c
View File

@ -1984,7 +1984,8 @@ main( int argc, char **argv )
if( def_cipher_string ) { if( def_cipher_string ) {
opt.def_cipher_algo = string_to_cipher_algo(def_cipher_string); opt.def_cipher_algo = string_to_cipher_algo(def_cipher_string);
if(opt.def_cipher_algo==0 && if(opt.def_cipher_algo==0 &&
ascii_strcasecmp(def_cipher_string,"idea")==0) (ascii_strcasecmp(def_cipher_string,"idea")==0
|| ascii_strcasecmp(def_cipher_string,"s1")==0))
idea_cipher_warn(1); idea_cipher_warn(1);
m_free(def_cipher_string); def_cipher_string = NULL; m_free(def_cipher_string); def_cipher_string = NULL;
if( check_cipher_algo(opt.def_cipher_algo) ) if( check_cipher_algo(opt.def_cipher_algo) )

5
g10/main.h
View File

@ -72,7 +72,12 @@ int openpgp_cipher_test_algo( int algo );
int openpgp_pk_test_algo( int algo, unsigned int usage_flags ); int openpgp_pk_test_algo( int algo, unsigned int usage_flags );
int openpgp_pk_algo_usage ( int algo ); int openpgp_pk_algo_usage ( int algo );
int openpgp_md_test_algo( int algo ); int openpgp_md_test_algo( int algo );
#ifdef USE_IDEA
void idea_cipher_warn( int show ); void idea_cipher_warn( int show );
#else
#define idea_cipher_warn(a)
#endif
struct expando_args struct expando_args
{ {

2
g10/misc.c
View File

@ -289,6 +289,7 @@ openpgp_md_test_algo( int algo )
return check_digest_algo(algo); return check_digest_algo(algo);
} }
#ifdef USE_IDEA
/* Special warning for the IDEA cipher */ /* Special warning for the IDEA cipher */
void void
idea_cipher_warn(int show) idea_cipher_warn(int show)
@ -303,6 +304,7 @@ idea_cipher_warn(int show)
warned=1; warned=1;
} }
} }
#endif
/* Expand %-strings. Returns a string which must be m_freed. Returns /* Expand %-strings. Returns a string which must be m_freed. Returns
NULL if the string cannot be expanded (too large). */ NULL if the string cannot be expanded (too large). */