From 32507c8fdf322ab9246ca3b6b5951d9c35c10ffe Mon Sep 17 00:00:00 2001 From: Noriaki TAKAMIYA Date: Sun, 22 Oct 2006 15:06:46 +1000 Subject: [PATCH] --- yaml --- r: 47007 b: refs/heads/master c: dc2e2f33bbf07344995357314fd8887f6564dba7 h: refs/heads/master i: 47005: 7be831080b55a98c3ceb8998a4c03d96a7b4b4fb 47003: e08491c128aeef153e702e143567d97488b1ddb6 46999: bb79dc580ee1a220a4473da0c29d86427eab4bb5 46991: 429702d18b95c629f6b5afe7de221e2604d5fd5f 46975: 78f825a8152d994f2beab0eff88012cd57aab3fa v: v3 --- [refs] | 2 +- trunk/Documentation/crypto/api-intro.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 355e3d18fc0a..a828b64ae4d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a0dc8d733de4aca958a73019877f96b4754d671 +refs/heads/master: dc2e2f33bbf07344995357314fd8887f6564dba7 diff --git a/trunk/Documentation/crypto/api-intro.txt b/trunk/Documentation/crypto/api-intro.txt index 5a03a2801d67..e41a79aa71ce 100644 --- a/trunk/Documentation/crypto/api-intro.txt +++ b/trunk/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 Please send any credits updates or corrections to: