[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  3e8fcd3d1f9343707e1c4f9e8d5deb32bfac6538 (commit)
      from  1c9858d0d013184ff756d063022161b1853a9cbf (commit)


- Log -----------------------------------------------------------------
commit 3e8fcd3d1f9343707e1c4f9e8d5deb32bfac6538
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Mar 4 18:51:57 2018 -0500

    Fix credit for SRP code
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5504)

-----------------------------------------------------------------------

Summary of changes:
 CHANGES | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index c835f6a..415260f 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 at 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 at edelweb.fr>, Peter Sylvester
+     <peter.sylvester at edelweb.fr>, Tom Wu <tjw at cs.stanford.edu>, and
+     Ben Laurie]
 
   *) Add functions to copy EVP_PKEY_METHOD and retrieve flags and id.
      [Steve Henson]