summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2018-03-04 18:51:57 -0500
committerRich Salz <rsalz@openssl.org>2018-03-04 18:51:57 -0500
commit3e8fcd3d1f9343707e1c4f9e8d5deb32bfac6538 (patch)
tree564b53da273641be543ae09c4e4e3ad531fe4f58
parent1c9858d0d013184ff756d063022161b1853a9cbf (diff)
Fix credit for SRP code
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5504)
-rw-r--r--CHANGES7
1 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index c835f6aae4..415260fe2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3260,8 +3260,11 @@
to work with OPENSSL_NO_SSL_INTERN defined.
[Steve Henson]
- *) Add SRP support.
- [Tom Wu <tjw@cs.stanford.edu> and Ben Laurie]
+ *) A long standing patch to add support for SRP from EdelWeb (Peter
+ Sylvester and Christophe Renou) was integrated.
+ [Christophe Renou <christophe.renou@edelweb.fr>, Peter Sylvester
+ <peter.sylvester@edelweb.fr>, Tom Wu <tjw@cs.stanford.edu>, and
+ Ben Laurie]
*) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id.
[Steve Henson]