diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:01:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:01:09 -0700 |
| commit | 7e2aca4a445cb5535d1fbfc850915068488d35a2 (patch) | |
| tree | 4c4e8f026a104133d2c17af316897b264f68f398 /Documentation | |
| parent | a5b62ecbd4a108e595f47a475e7a3acf5ca24f0b (diff) | |
| parent | 2d7b390ca689a3b18d0612627f76748e23d64975 (diff) | |
| download | history-7e2aca4a445cb5535d1fbfc850915068488d35a2.tar.gz | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/crypto/api-intro.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt index d932f686b203a4..1df474c4ecdb4f 100644 --- a/Documentation/crypto/api-intro.txt +++ b/Documentation/crypto/api-intro.txt @@ -221,6 +221,12 @@ AES algorithm contributors: CAST5 algorithm contributors: Kartikey Mahendra Bhatt (original developers unknown, FSF copyright). +TEA/XTEA algorithm contributors: + Aaron Grothe + +Khazad algorithm contributors: + Aaron Grothe + Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com> Please send any credits updates or corrections to: |