summaryrefslogtreecommitdiffstats
path: root/Documentation/crypto
diff options
context:
space:
mode:
authorNoriaki TAKAMIYA <takamiya@po.ntts.co.jp>2006-10-22 15:06:46 +1000
committerHerbert Xu <herbert@gondor.apana.org.au>2007-02-07 09:21:05 +1100
commitdc2e2f33bbf07344995357314fd8887f6564dba7 (patch)
tree6da1d238645e33efd21bca24a792aba2d8e7f523 /Documentation/crypto
parent6a0dc8d733de4aca958a73019877f96b4754d671 (diff)
downloadop-kernel-dev-dc2e2f33bbf07344995357314fd8887f6564dba7.zip
op-kernel-dev-dc2e2f33bbf07344995357314fd8887f6564dba7.tar.gz
[CRYPTO] doc: added the developer of Camellia cipher
This patch adds the developer of Camellia cipher algorithm. Signed-off-by: Noriaki TAKAMIYA <takamiya@po.ntts.co.jp> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'Documentation/crypto')
-rw-r--r--Documentation/crypto/api-intro.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt
index 5a03a28..e41a79a 100644
--- a/Documentation/crypto/api-intro.txt
+++ b/Documentation/crypto/api-intro.txt
@@ -193,6 +193,7 @@ Original developers of the crypto algorithms:
Kartikey Mahendra Bhatt (CAST6)
Jon Oberheide (ARC4)
Jouni Malinen (Michael MIC)
+ NTT(Nippon Telegraph and Telephone Corporation) (Camellia)
SHA1 algorithm contributors:
Jean-Francois Dive
@@ -246,6 +247,9 @@ Tiger algorithm contributors:
VIA PadLock contributors:
Michal Ludvig
+Camellia algorithm contributors:
+ NTT(Nippon Telegraph and Telephone Corporation) (Camellia)
+
Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>
Please send any credits updates or corrections to:
OpenPOWER on IntegriCloud