[openssl-commits] [openssl] master update

[Tim Hudson]

The branch master has been updated
       via  3b855b1f892bb26aca760b331afe506527fe369c (commit)
      from  d3bc941df4142be4042e78ab9ba07fb296c424d1 (commit)


- Log -----------------------------------------------------------------
commit 3b855b1f892bb26aca760b331afe506527fe369c
Author: Tim Hudson <tjh at cryptsoft.com>
Date:   Tue Mar 13 18:33:44 2018 +1000

    update SRP copyright notice
    
    As per discussion with Peter Sylvester
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5603)

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

Summary of changes:
 apps/srp.c            | 4 ++++
 crypto/srp/srp_lib.c  | 6 +++++-
 crypto/srp/srp_vfy.c  | 6 +++++-
 include/openssl/srp.h | 6 +++++-
 ssl/tls_srp.c         | 6 +++++-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/apps/srp.c b/apps/srp.c
index 5e7f3b9..689574a 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -1,10 +1,14 @@
 /*
  * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
+ *
+ * Originally written by Christophe Renou and Peter Sylvester,
+ * for the EdelKey project.
  */
 
 #include <openssl/opensslconf.h>
diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index e79352c..b97d630 100644
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -1,10 +1,14 @@
 /*
- * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
+ *
+ * Originally written by Christophe Renou and Peter Sylvester,
+ * for the EdelKey project.
  */
 
 #ifndef OPENSSL_NO_SRP
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index eb4a38d..56ae94b 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -1,10 +1,14 @@
 /*
- * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
+ *
+ * Originally written by Christophe Renou and Peter Sylvester,
+ * for the EdelKey project.
  */
 
 #ifndef OPENSSL_NO_SRP
diff --git a/include/openssl/srp.h b/include/openssl/srp.h
index f2b6ec7..aaf1355 100644
--- a/include/openssl/srp.h
+++ b/include/openssl/srp.h
@@ -1,10 +1,14 @@
 /*
- * Copyright 2011-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
+ *
+ * Originally written by Christophe Renou and Peter Sylvester,
+ * for the EdelKey project.
  */
 
 #ifndef HEADER_SRP_H
diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c
index 37adcbc..d732328 100644
--- a/ssl/tls_srp.c
+++ b/ssl/tls_srp.c
@@ -1,10 +1,14 @@
 /*
- * Copyright 2004-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2004, EdelKey Project. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
+ *
+ * Originally written by Christophe Renou and Peter Sylvester,
+ * for the EdelKey project.
  */
 
 #include <openssl/crypto.h>