From: Richard Levitte <levitte@openssl.org>
Date: Thu, 6 Dec 2018 12:39:21 +0000 (+0100)
Subject: Following the license change, modify the boilerplates in crypto/err/
X-Git-Tag: openssl-3.0.0-alpha1~2806
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4ad239b8a205d8d7278cd895503c8678438c2cb1;p=oweals%2Fopenssl.git

Following the license change, modify the boilerplates in crypto/err/

[skip ci]

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7793)
---

diff --git a/crypto/err/err.c b/crypto/err/err.c
index da1b90df16..aea97a0fef 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 d9ec04b606..83ceff5c2e 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 c82e62947e..ba9a7c59ef 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 0f8cbf4df9..1c45b47713 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