aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-06-18 10:03:45 -0400
committerJack Lloyd <[email protected]>2016-06-18 10:03:45 -0400
commit924f2966a48c4dd94a45e1f58f0ef85c4f40c8d7 (patch)
treecb8f8a2017b53ba93caeaf89885af99a186ef03e /doc
parent6ad180b5c55dfa68af5456ad45ac52c51584dcae (diff)
parent00337c4ea2af6b1727be0bdf9b719c98760a14fd (diff)
Merge GH #497 Add StreamCipher::seek and implementation for ChaCha
Also adds ChaCha8 support
Diffstat (limited to 'doc')
-rw-r--r--doc/credits.rst7
-rw-r--r--doc/license.txt1
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/credits.rst b/doc/credits.rst
index 6d62b6380..af78680a4 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -104,3 +104,10 @@ snail-mail address (S), and Bitcoin address (B).
W: https://www.kullo.net
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
diff --git a/doc/license.txt b/doc/license.txt
index ef0b97ac1..fd4fd0a7b 100644
--- a/doc/license.txt
+++ b/doc/license.txt
@@ -29,6 +29,7 @@ Copyright (C) 1999-2013,2014,2015,2016 Jack Lloyd
2015,2016 Daniel Neus
2015 Uri Blumenthal
2015,2016 Kai Michaelis
+ 2016 Simon Cogliani
All rights reserved.
Redistribution and use in source and binary forms, with or without