diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-09 00:25:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-09 00:25:18 +0100 |
| commit | 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6 (patch) | |
| tree | 9216a285bfe23aa799ca6efa01a3f4063d798e64 /net/xfrm | |
| parent | [NET]: Fix net/socket.c warnings. (diff) | |
| parent | [CRYPTO] doc: added the developer of Camellia cipher (diff) | |
| download | linux-9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6.tar.xz linux-9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6.zip | |
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_algo.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_algo.c b/net/xfrm/xfrm_algo.c index f1cf3402e75c..248f94814dfb 100644 --- a/net/xfrm/xfrm_algo.c +++ b/net/xfrm/xfrm_algo.c @@ -266,6 +266,23 @@ static struct xfrm_algo_desc ealg_list[] = { } }, { + .name = "cbc(camellia)", + + .uinfo = { + .encr = { + .blockbits = 128, + .defkeybits = 128, + } + }, + + .desc = { + .sadb_alg_id = SADB_X_EALG_CAMELLIACBC, + .sadb_alg_ivlen = 8, + .sadb_alg_minbits = 128, + .sadb_alg_maxbits = 256 + } +}, +{ .name = "cbc(twofish)", .compat = "twofish", |