diff options
| author | David Shaw <[email protected]> | 2003-05-15 05:29:05 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-05-15 05:29:05 +0000 |
| commit | 0048ebcbaeb754a3920cfe6ee01f16e96a54b328 (patch) | |
| tree | 3c8699061e8549cf8efdf2b2be789ec072d2679f /cipher/cipher.c | |
| parent | * types.h: Add initializer macros for 64-bit unsigned type. (diff) | |
| download | gnupg-0048ebcbaeb754a3920cfe6ee01f16e96a54b328.tar.gz gnupg-0048ebcbaeb754a3920cfe6ee01f16e96a54b328.zip | |
* cipher.c (setup_cipher_table): #ifdef IDEA.
* random.c (fast_random_poll): Only use times() if we HAVE_TIMES.
* sha512.c, tiger.c: Use the U64_C() macro to specify 64-bit constants.
U64_C is defined in include/types.h and uses the correct suffix depending
on the underlying type of u64.
* idea-stub.c (load_module): Catch an error if the idea module file is
unloadable for some reason (unreadable, bad permissions, etc.)
* md.c (string_to_digest_algo): Give a warning about TIGER192 not being
part of OpenPGP.
Diffstat (limited to '')
| -rw-r--r-- | cipher/cipher.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/cipher/cipher.c b/cipher/cipher.c index ff19219e4..4518d909c 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -176,16 +176,20 @@ setup_cipher_table(void) if( !cipher_table[i].name ) BUG(); i++; + +#ifdef USE_IDEA cipher_table[i].algo = CIPHER_ALGO_IDEA; cipher_table[i].name = idea_get_info( cipher_table[i].algo, - &cipher_table[i].keylen, - &cipher_table[i].blocksize, - &cipher_table[i].contextsize, - &cipher_table[i].setkey, - &cipher_table[i].encrypt, - &cipher_table[i].decrypt ); + &cipher_table[i].keylen, + &cipher_table[i].blocksize, + &cipher_table[i].contextsize, + &cipher_table[i].setkey, + &cipher_table[i].encrypt, + &cipher_table[i].decrypt ); if (cipher_table[i].name) - i++; /* Note that IDEA is usually not available. */ + i++; /* Note that the loadable IDEA module may not be + available. */ +#endif #ifdef ALLOW_DUMMY cipher_table[i].algo = CIPHER_ALGO_DUMMY; |