[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  8573be06a99cd1260b4988e9fa58e75df32c3be4 (commit)
      from  6f888e05e5fa4f2f98e8f0c89f3b2cb8f9b3262d (commit)


- Log -----------------------------------------------------------------
commit 8573be06a99cd1260b4988e9fa58e75df32c3be4
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:44:07 2018 +0100

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

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

Summary of changes:
 crypto/lhash/lh_stats.c  | 2 +-
 crypto/lhash/lhash.c     | 2 +-
 crypto/lhash/lhash_lcl.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c
index 65b91e1..1b32b5d 100644
--- a/crypto/lhash/lh_stats.c
+++ b/crypto/lhash/lh_stats.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-2017 The OpenSSL Project Authors. 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/lhash/lhash.c b/crypto/lhash/lhash.c
index 8d9f933..c826039 100644
--- a/crypto/lhash/lhash.c
+++ b/crypto/lhash/lhash.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-2018 The OpenSSL Project Authors. 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/lhash/lhash_lcl.h b/crypto/lhash/lhash_lcl.h
index 678224a..ad9dd4d 100644
--- a/crypto/lhash/lhash_lcl.h
+++ b/crypto/lhash/lhash_lcl.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-2018 The OpenSSL Project Authors. 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