[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  726cd62662616b3db1cf535df9a7797eb3ff7489 (commit)
      from  da25dc2985a93ffade1f3467b496eb53577a1f8c (commit)


- Log -----------------------------------------------------------------
commit 726cd62662616b3db1cf535df9a7797eb3ff7489
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Mar 4 18:54:42 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 83ec14e..f2bc2b3 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 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]