aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-11-26 05:31:31 -0500
committerJack Lloyd <[email protected]>2016-11-26 05:31:31 -0500
commit6f59f7adbbc65c1020e0468623ea65d6ab061bb4 (patch)
tree9e216bbbdf4b53a8e83b6e02d69f00b3b0ccf3e3 /doc
parentcc010f7c233949b908db6139bb3ccedb34372996 (diff)
parent33762ef4d3dc43cde0c91f19f834627c0f124b30 (diff)
Merge GH #739 Update docs and BSI policy
Diffstat (limited to 'doc')
-rw-r--r--doc/credits.rst9
1 files changed, 8 insertions, 1 deletions
diff --git a/doc/credits.rst b/doc/credits.rst
index cef62f0d4..e13e38c85 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -29,6 +29,13 @@ snail-mail address (S), and Bitcoin address (B).
N: Olivier de Gaalon
D: SQLite encryption codec (src/contrib/sqlite)
+ N: Matthias Gierlings
+ W: https://www.hackmanit.de/
+ P: 39E0 D270 19A4 B356 05D0 29AE 1BD3 49CF 744A 02FF
+ D: GMAC, Extended Hash-Based Signatures (XMSS)
+ S: Bochum, Germany
+
N: Matthew Gregan
D: Binary file I/O support, allocator fixes
@@ -124,7 +131,7 @@ snail-mail address (S), and Bitcoin address (B).
W: https://sirrix.com/
D: KDF1-18033, ECIES
S: Saarland, Germany
-
+
N: Daniel Neus
W: https://sirrix.com/