diff options
| author | David Shaw <[email protected]> | 2003-02-22 13:00:18 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-02-22 13:00:18 +0000 |
| commit | 6f41d068418ca9a9ff7541d5fafc1fcdb20804cf (patch) | |
| tree | 4f508a2ed6846271970e2ee48cd0bcb77db6c087 | |
| parent | * configure.ac: Add --disable-xxx options for CAST5, BLOWFISH, AES (all), (diff) | |
| download | gnupg-6f41d068418ca9a9ff7541d5fafc1fcdb20804cf.tar.gz gnupg-6f41d068418ca9a9ff7541d5fafc1fcdb20804cf.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/g10.c | 3 | ||||
| -rw-r--r-- | g10/main.h | 5 | ||||
| -rw-r--r-- | g10/misc.c | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 74aec4ac9..2eadc3f16 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2003-02-22 David Shaw <[email protected]> + + * 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 <[email protected]> * keygen.c (keygen_set_std_prefs): Don't put AES or CAST5 in @@ -1984,7 +1984,8 @@ main( int argc, char **argv ) if( def_cipher_string ) { opt.def_cipher_algo = string_to_cipher_algo(def_cipher_string); 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); m_free(def_cipher_string); def_cipher_string = NULL; if( check_cipher_algo(opt.def_cipher_algo) ) diff --git a/g10/main.h b/g10/main.h index 418653460..c41d783ff 100644 --- a/g10/main.h +++ b/g10/main.h @@ -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_algo_usage ( int algo ); int openpgp_md_test_algo( int algo ); + +#ifdef USE_IDEA void idea_cipher_warn( int show ); +#else +#define idea_cipher_warn(a) +#endif struct expando_args { diff --git a/g10/misc.c b/g10/misc.c index c5506948a..08bbdc6fe 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -289,6 +289,7 @@ openpgp_md_test_algo( int algo ) return check_digest_algo(algo); } +#ifdef USE_IDEA /* Special warning for the IDEA cipher */ void idea_cipher_warn(int show) @@ -303,6 +304,7 @@ idea_cipher_warn(int show) warned=1; } } +#endif /* Expand %-strings. Returns a string which must be m_freed. Returns NULL if the string cannot be expanded (too large). */ |