From: Rich Salz <rsalz@openssl.org>
Date: Sun, 4 Mar 2018 23:53:45 +0000 (-0500)
Subject: Fix credit for SRP code
X-Git-Tag: OpenSSL_1_1_0h~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fa740328d67ee39f6db647e28ea5034e427ad83e;p=oweals%2Fopenssl.git

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 8840bd6c00..3eb1cc3d19 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3035,8 +3035,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]