[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4ad239b8a205d8d7278cd895503c8678438c2cb1 (commit)
      from  3c120f91656f90a9a3b629bb6ea9d5a1f0d4d678 (commit)


- Log -----------------------------------------------------------------
commit 4ad239b8a205d8d7278cd895503c8678438c2cb1
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Dec 6 13:39:21 2018 +0100

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

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

Summary of changes:
 crypto/err/err.c       | 2 +-
 crypto/err/err_all.c   | 2 +-
 crypto/err/err_prn.c   | 2 +-
 crypto/err/openssl.txt | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index da1b90d..aea97a0 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.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/err/err_all.c b/crypto/err/err_all.c
index d9ec04b..83ceff5 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.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/err/err_prn.c b/crypto/err/err_prn.c
index c82e629..ba9a7c5 100644
--- a/crypto/err/err_prn.c
+++ b/crypto/err/err_prn.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/err/openssl.txt b/crypto/err/openssl.txt
index 0f8cbf4..1c45b47 100644
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1,6 +1,6 @@
 # Copyright 1999-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