Following the license change, modify the boilerplates in last few

[skip ci]

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

diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index e3a40a92cbb9cf0bf15d76d154b6205d4a84517e..3df12a321bb6901acf02d37c3b4ac113dce7162e 100644 (file)
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -2,7 +2,7 @@
 # -*- mode: perl; -*-
 # Copyright 2016-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/Configure b/Configure
index 5c67591dc8bbb1c5549bd980dd34d43f7dead922..ffbb8e124a8bf0ffeac2f22b32e0e9c41379c9a9 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -2,7 +2,7 @@
 # -*- mode: perl; -*-
 # Copyright 2016-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/VMS/VMSify-conf.pl b/VMS/VMSify-conf.pl
index 21eff113f8506512e8b854d3d252f13829d2cb39..a3844e505c2b700b3d0e6a3ca1033975ed6d371f 100644 (file)
--- a/VMS/VMSify-conf.pl
+++ b/VMS/VMSify-conf.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2004-2016 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/VMS/translatesyms.pl b/VMS/translatesyms.pl
index f61d954ec56efc967053fd9c286c0fd3df60be08..c7d1bc1ce75c5d27e35f64a087aff7d2475b7590 100644 (file)
--- a/VMS/translatesyms.pl
+++ b/VMS/translatesyms.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2016 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/config b/config
index b8adf3499953d4cb3eb6f10f299fb7e2bb0f37d7..27d2f61aefef8f6c7a6cd4df211f3ac10ce92f1a 100755 (executable)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1998-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/config.com b/config.com
index 46ccaa20d33dfeff4cfd06ccae7855fc11840807..1e1b925ab8f76e05da739c28210067481a2a3470 100644 (file)
--- a/config.com
+++ b/config.com
@@ -1,7 +1,7 @@
 $      ! OpenSSL config: determine the architecture and run Configure
 $      ! Copyright 2016-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/e_os.h b/e_os.h
index 534059382b0a81d2a500564ae94c48203cf0b4c3..6cdd35e6e1ffd5319458ec635962c4d9431a6902 100644 (file)
--- a/e_os.h
+++ b/e_os.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