aboutsummaryrefslogtreecommitdiffstats
path: root/cipher/cipher.c
diff options
context:
space:
mode:
Diffstat (limited to 'cipher/cipher.c')
-rw-r--r--cipher/cipher.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 311919fe1..b50e9a337 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -1,5 +1,6 @@
/* cipher.c - cipher dispatcher
- * Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ * 2007 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@@ -178,6 +179,20 @@ setup_cipher_table(void)
BUG();
i++;
+#ifdef USE_CAMELLIA
+ cipher_table[i].algo = CIPHER_ALGO_CAMELLIA;
+ cipher_table[i].name = camellia_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 );
+ if( !cipher_table[i].name )
+ BUG();
+ i++;
+#endif
+
#ifdef USE_IDEA
cipher_table[i].algo = CIPHER_ALGO_IDEA;
cipher_table[i].name = idea_get_info( cipher_table[i].algo,