From: Rich Salz <rsalz@openssl.org>
Date: Sun, 4 Mar 2018 23:54:42 +0000 (-0500)
Subject: Fix credit for SRP code
X-Git-Tag: OpenSSL_1_0_2o~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=726cd62662616b3db1cf535df9a7797eb3ff7489;p=openssl

Fix credit for SRP code

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5504)
---

diff --git a/CHANGES b/CHANGES
index 83ec14e1b0..f2bc2b321d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2016,8 +2016,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]