[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7428b99b2dace74eae1f9a1257d2939727dbed19 (commit)
      from  f9f859adc6e77b1e0bd70bdc07cdef36a63480c7 (commit)


- Log -----------------------------------------------------------------
commit 7428b99b2dace74eae1f9a1257d2939727dbed19
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:56:57 2018 +0100

    Following the license change, modify the boilerplates in crypto/srp/
    
    [skip ci]
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7819)

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

Summary of changes:
 crypto/srp/srp_lib.c | 2 +-
 crypto/srp/srp_vfy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/srp/srp_lib.c b/crypto/srp/srp_lib.c
index a9e244e..c43d27a 100644
--- a/crypto/srp/srp_lib.c
+++ b/crypto/srp/srp_lib.c
@@ -2,7 +2,7 @@
  * 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
+ * Licensed under the Apache License 2.0 (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
diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c
index 814f042..4ed94b7 100644
--- a/crypto/srp/srp_vfy.c
+++ b/crypto/srp/srp_vfy.c
@@ -2,7 +2,7 @@
  * 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
+ * Licensed under the Apache License 2.0 (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