From: Richard Levitte Date: Thu, 6 Dec 2018 13:07:27 +0000 (+0100) Subject: Following the license change, modify the boilerplates in engines/ X-Git-Tag: openssl-3.0.0-alpha1~2767 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab3fa1c0ad5f01c8c86495227efb61c20c7972fa;p=thirdparty%2Fopenssl.git Following the license change, modify the boilerplates in engines/ [skip ci] Reviewed-by: Matt Caswell (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 5b097ce3ef9..73e72e61e73 100644 --- 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 09b0aaa48df..63a05320949 100644 --- 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 f09c396ed92..19d98d897b0 100644 --- 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 2c03c448d68..42b48301ac0 100644 --- 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 3b79305acf9..e32c880b07f 100644 --- 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 18fe9c34e0e..cd5b7b2f849 100644 --- 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 3eb1332bbfe..bd1dd154549 100644 --- 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 37202b81f39..c3a8306ab1f 100644 --- 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 3f34cdf6b7e..29724e63e64 100644 --- 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 b72bc51a874..923723adaba 100644 --- 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 e034c98cae8..544f7fe3586 100644 --- 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 b005f421a66..2e124114f9a 100644 --- 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 bff64bcf2f5..9a7b49896cc 100644 --- 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 794fb710cf6..f71f6fedb36 100644 --- 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 7c2c0278790..844615e9edf 100644 --- 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 64376247c3f..1284742ec32 100644 --- 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 2b2e31a0756..b16c4aa5755 100644 --- 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 920a13a6922..57c71e3d702 100644 --- 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 e745c1a236d..03f7bfb8c44 100644 --- 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 4d5df7f26ba..daf8c94ceb5 100644 --- 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