diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 18:25:18 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-08 18:25:18 -0500 |
| commit | 9783e1df7a6bd1e4dc5e2cafcdc29b65a47473d6 (patch) | |
| tree | 9216a285bfe23aa799ca6efa01a3f4063d798e64 /Documentation | |
| parent | 4387ff75f29412a234d394b0276c2b239d3d3844 (diff) | |
| parent | dc2e2f33bbf07344995357314fd8887f6564dba7 (diff) | |
Merge branch 'HEAD' of master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
Conflicts:
crypto/Kconfig
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/crypto/api-intro.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt index 5a03a2801d67..e41a79aa71ce 100644 --- a/Documentation/crypto/api-intro.txt +++ b/Documentation/crypto/api-intro.txt | |||
| @@ -193,6 +193,7 @@ Original developers of the crypto algorithms: | |||
| 193 | Kartikey Mahendra Bhatt (CAST6) | 193 | Kartikey Mahendra Bhatt (CAST6) |
| 194 | Jon Oberheide (ARC4) | 194 | Jon Oberheide (ARC4) |
| 195 | Jouni Malinen (Michael MIC) | 195 | Jouni Malinen (Michael MIC) |
| 196 | NTT(Nippon Telegraph and Telephone Corporation) (Camellia) | ||
| 196 | 197 | ||
| 197 | SHA1 algorithm contributors: | 198 | SHA1 algorithm contributors: |
| 198 | Jean-Francois Dive | 199 | Jean-Francois Dive |
| @@ -246,6 +247,9 @@ Tiger algorithm contributors: | |||
| 246 | VIA PadLock contributors: | 247 | VIA PadLock contributors: |
| 247 | Michal Ludvig | 248 | Michal Ludvig |
| 248 | 249 | ||
| 250 | Camellia algorithm contributors: | ||
| 251 | NTT(Nippon Telegraph and Telephone Corporation) (Camellia) | ||
| 252 | |||
| 249 | Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com> | 253 | Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com> |
| 250 | 254 | ||
| 251 | Please send any credits updates or corrections to: | 255 | Please send any credits updates or corrections to: |