diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2007-05-02 06:27:11 +0000 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2007-05-02 06:27:11 +0000 |
| commit | 7d186d66403cefb615a0f39016c54e5cfa4427c4 (patch) | |
| tree | 70911078d79d38576ed600a79f49ee088b479b73 /cipher | |
| parent | 9164a4caf8a00b4b4c38a1174ef2fed895f1ed99 (diff) | |
| download | libgcrypt-7d186d66403cefb615a0f39016c54e5cfa4427c4.tar.gz | |
Add Camellia support.
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/ChangeLog | 10 | ||||
| -rw-r--r-- | cipher/Makefile.am | 3 | ||||
| -rw-r--r-- | cipher/cipher.c | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 72ec0d2d..f9b10368 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,13 @@ +2007-05-02 David Shaw <dshaw@jabberwocky.com> + + * Makefile.am, cipher.c: Add Camellia. + + * camellia-glue.c: New. The necessary glue to interface libgcrypt + to the stock NTT Camellia distribution. + + * camellia.h, camellia.c: The stock NTT Camellia distribution + (GPL). + 2007-04-30 David Shaw <dshaw@jabberwocky.com> * cipher.c: Use #if instead of #ifdef as configure defines the diff --git a/cipher/Makefile.am b/cipher/Makefile.am index 94958efd..4fb47b36 100644 --- a/cipher/Makefile.am +++ b/cipher/Makefile.am @@ -75,7 +75,8 @@ sha512.c \ tiger.c \ whirlpool.c \ twofish.c \ -rfc2268.c +rfc2268.c \ +camellia.c camellia.h camellia-glue.c # We need to lower the optimization for this module. tiger.o: $(srcdir)/tiger.c diff --git a/cipher/cipher.c b/cipher/cipher.c index f116503b..1538b4ce 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -75,6 +75,11 @@ static struct cipher_table_entry #if USE_SEED { &_gcry_cipher_spec_seed, GCRY_CIPHER_SEED }, #endif +#if USE_CAMELLIA + { &_gcry_cipher_spec_camellia128, GCRY_CIPHER_CAMELLIA128 }, + { &_gcry_cipher_spec_camellia192, GCRY_CIPHER_CAMELLIA192 }, + { &_gcry_cipher_spec_camellia256, GCRY_CIPHER_CAMELLIA256 }, +#endif { NULL } }; |