diff options
| author | Werner Koch <wk@gnupg.org> | 2008-04-18 11:20:25 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2008-04-18 11:20:25 +0200 |
| commit | 4896f5f47c1a58a4ee81c1ce1ef879fd3156bbe7 (patch) | |
| tree | fb2741341342ef10c52ef1f345eef45eda8defe0 /include | |
| parent | Test commit (diff) | |
| download | gnupg2-4896f5f47c1a58a4ee81c1ce1ef879fd3156bbe7.tar.xz gnupg2-4896f5f47c1a58a4ee81c1ce1ef879fd3156bbe7.zip | |
Adjust for the changed Camellia draft.
W32 gettext changes.
Comment and typo fixes.
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/cipher.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index b4362bedd..559d305ba 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2008-04-18 Werner Koch <wk@g10code.com> + + * cipher.h (CIPHER_ALGO_CAMELLIA256): Change ID to 13. + (CIPHER_ALGO_CAMELLIA192): New. + 2007-12-12 Werner Koch <wk@g10code.com> * cipher.h (CIPHER_ALGO_CAMELLIA128, CIPHER_ALGO_CAMELLIA256): New. diff --git a/include/cipher.h b/include/cipher.h index 52c4f27b1..0d75fa6cd 100644 --- a/include/cipher.h +++ b/include/cipher.h @@ -47,7 +47,8 @@ #define CIPHER_ALGO_TWOFISH /* 10 */ GCRY_CIPHER_TWOFISH /* 256 bit */ /* Note: Camellia ids don't match those used by libgcrypt. */ #define CIPHER_ALGO_CAMELLIA128 11 -#define CIPHER_ALGO_CAMELLIA256 12 +#define CIPHER_ALGO_CAMELLIA192 12 +#define CIPHER_ALGO_CAMELLIA256 13 #define CIPHER_ALGO_DUMMY 110 /* No encryption at all. */ #define PUBKEY_ALGO_RSA /* 1 */ GCRY_PK_RSA |