Following the license change, modify the boilerplates in engines/

[skip ci]

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

diff --git a/engines/asm/e_padlock-x86.pl b/engines/asm/e_padlock-x86.pl
index 5b097ce3ef9b10cf517907bb1ad425e2cf68674c..73e72e61e73b19384c8cb12f01c769a440864e61 100644 (file)
--- a/engines/asm/e_padlock-x86.pl
+++ b/engines/asm/e_padlock-x86.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2011-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/engines/asm/e_padlock-x86_64.pl b/engines/asm/e_padlock-x86_64.pl
index 09b0aaa48dfed22bd1a25f8b976af1f935f9cda5..63a0532094958416e247b1b61885b9c6fec1e1cc 100644 (file)
--- a/engines/asm/e_padlock-x86_64.pl
+++ b/engines/asm/e_padlock-x86_64.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2011-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/engines/e_afalg.c b/engines/e_afalg.c
index f09c396ed92386f832c371025b0f06124de83753..19d98d897b0bdc74c45b36f73aedec3a8da47e54 100644 (file)
--- a/engines/e_afalg.c
+++ b/engines/e_afalg.c
@@ -1,7 +1,7 @@
 /*
  * 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/engines/e_afalg.h b/engines/e_afalg.h
index 2c03c448d684a479056be9d76b36c187006081ea..42b48301ac0444459c66d0b7249766cae118f3b5 100644 (file)
--- a/engines/e_afalg.h
+++ b/engines/e_afalg.h
@@ -1,7 +1,7 @@
 /*
  * 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/engines/e_afalg.txt b/engines/e_afalg.txt
index 3b79305acf9ba46812191ce92c38be5e12cb065f..e32c880b07feaa7d35509ca0e02bc64be0b7aad3 100644 (file)
--- a/engines/e_afalg.txt
+++ b/engines/e_afalg.txt
@@ -1,6 +1,6 @@
 # Copyright 1999-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/engines/e_afalg_err.c b/engines/e_afalg_err.c
index 18fe9c34e0e27cfffd9ea2492dc22e7438bbc5e2..cd5b7b2f849a779b9888b2bb3d3020aaddfe7ddd 100644 (file)
--- a/engines/e_afalg_err.c
+++ b/engines/e_afalg_err.c
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_afalg_err.h b/engines/e_afalg_err.h
index 3eb1332bbfe465a3268c02e9fc0fa03d23e86c7f..bd1dd1545496ef1c1293fb660e2016745f8fac09 100644 (file)
--- a/engines/e_afalg_err.h
+++ b/engines/e_afalg_err.h
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_capi.c b/engines/e_capi.c
index 37202b81f398e026d8ca0f68134892e082b5b0ae..c3a8306ab1f65468785f5fb0551812e70569c1ef 100644 (file)
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-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/engines/e_capi.txt b/engines/e_capi.txt
index 3f34cdf6b7e9d05bbb59676ec6786d6969fa1cec..29724e63e64c77ecc0b04b1edac930fedee551dc 100644 (file)
--- a/engines/e_capi.txt
+++ b/engines/e_capi.txt
@@ -1,6 +1,6 @@
 # Copyright 1999-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/engines/e_capi_err.c b/engines/e_capi_err.c
index b72bc51a874e0b0c5f791877f5960ad0767480b6..923723adaba8f0c8f093a77f97f619e1f0ffadae 100644 (file)
--- a/engines/e_capi_err.c
+++ b/engines/e_capi_err.c
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_capi_err.h b/engines/e_capi_err.h
index e034c98cae842ef08d523d81d9efb355b157c162..544f7fe3586d4f2613e0f14b1fdca48083f2c4f4 100644 (file)
--- a/engines/e_capi_err.h
+++ b/engines/e_capi_err.h
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_dasync.c b/engines/e_dasync.c
index b005f421a6604388d16e4da92606d3ebf453d6e8..2e124114f9a6e67ce8b81f202c3d52c389768d75 100644 (file)
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2015-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/engines/e_dasync.txt b/engines/e_dasync.txt
index bff64bcf2f541181af464461db9bf3ff2192b356..9a7b49896cc1cea70c083b5a2d67e548f28ec877 100644 (file)
--- a/engines/e_dasync.txt
+++ b/engines/e_dasync.txt
@@ -1,6 +1,6 @@
 # Copyright 1999-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/engines/e_dasync_err.c b/engines/e_dasync_err.c
index 794fb710cf6e545aa817ee68c120009c583f5985..f71f6fedb36922946c7aa159549ba5b29c21387d 100644 (file)
--- a/engines/e_dasync_err.c
+++ b/engines/e_dasync_err.c
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_dasync_err.h b/engines/e_dasync_err.h
index 7c2c0278790b569acf7f401364a7b66d9d109fa0..844615e9edfe56075a70f012ea147613841a9412 100644 (file)
--- a/engines/e_dasync_err.h
+++ b/engines/e_dasync_err.h
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_ossltest.c b/engines/e_ossltest.c
index 64376247c3f0334ec36d3ed5aeeaca28ab9489d4..1284742ec321ede14d8a451b3a2c98ba6200183b 100644 (file)
--- a/engines/e_ossltest.c
+++ b/engines/e_ossltest.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2015-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/engines/e_ossltest.txt b/engines/e_ossltest.txt
index 2b2e31a0756bf60c03b0638f18bb050e228d1bf5..b16c4aa57554ff97d65103cbf77822ef62056b10 100644 (file)
--- a/engines/e_ossltest.txt
+++ b/engines/e_ossltest.txt
@@ -1,6 +1,6 @@
 # Copyright 1999-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/engines/e_ossltest_err.c b/engines/e_ossltest_err.c
index 920a13a6922a67692149c2564a87d93a4935e2b0..57c71e3d702138c660477814d444a0820c1b1ffb 100644 (file)
--- a/engines/e_ossltest_err.c
+++ b/engines/e_ossltest_err.c
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_ossltest_err.h b/engines/e_ossltest_err.h
index e745c1a236d4dbd377d2360c2d8e125f0af30861..03f7bfb8c448b7a06065c2fda071542a9763777b 100644 (file)
--- a/engines/e_ossltest_err.h
+++ b/engines/e_ossltest_err.h
@@ -2,7 +2,7 @@
  * Generated by util/mkerr.pl DO NOT EDIT
  * 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/engines/e_padlock.c b/engines/e_padlock.c
index 4d5df7f26ba4b2458390eafc54cda638fb7da0f6..daf8c94ceb5e044684a3d3c4b199138ba4c4b5a4 100644 (file)
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2004-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