aboutsummaryrefslogtreecommitdiffstats
path: root/doc/credits.rst
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-06-20 01:20:25 -0400
committerJack Lloyd <[email protected]>2016-06-20 01:20:25 -0400
commit17741e56503bf538b5cceb29269c1f4981f649fb (patch)
tree0fad04db916b008789a34c7bb41750815c2af66f /doc/credits.rst
parent23d6f67e76b633077b5de91945f61290ff091e1e (diff)
parent88ed5a6ed0c3c5c63e768d076253ecb77df2b338 (diff)
Merge GH #483 Add ECIES and KDF1 from ISO 18033
Diffstat (limited to 'doc/credits.rst')
-rw-r--r--doc/credits.rst18
1 files changed, 12 insertions, 6 deletions
diff --git a/doc/credits.rst b/doc/credits.rst
index af78680a4..232a1ad8a 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -15,6 +15,13 @@ snail-mail address (S), and Bitcoin address (B).
D: documentation editing
S: Oregon, USA
+ N: Simon Cogliani
+ W: https://www.tanker.io/
+ P: EA73 D0AF 5A81 A61A 8931 C2CA C9AB F2E4 3820 4F25
+ D: Getting keystream of ChaCha
+ S: Paris, France
+
N: Martin Doering
D: GF(p) arithmetic
@@ -105,9 +112,8 @@ snail-mail address (S), and Bitcoin address (B).
D: Build system
S: Germany
- N: Simon Cogliani
- W: https://www.tanker.io/
- P: EA73 D0AF 5A81 A61A 8931 C2CA C9AB F2E4 3820 4F25
- D: Getting keystream of ChaCha
- S: Paris, France
+ N: Philipp Weber
+ W: https://sirrix.com/
+ D: KDF1-18033, ECIES
+ S: Saarland, Germany