The branch master has been updated via ab3fa1c0ad5f01c8c86495227efb61c20c7972fa (commit) from 3187791ed361adbb7ea04b738a949767d6eb76ed (commit)
- Log ----------------------------------------------------------------- commit ab3fa1c0ad5f01c8c86495227efb61c20c7972fa Author: Richard Levitte <levi...@openssl.org> Date: Thu Dec 6 14:07:27 2018 +0100 Following the license change, modify the boilerplates in engines/ [skip ci] Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7832) ----------------------------------------------------------------------- Summary of changes: engines/asm/e_padlock-x86.pl | 2 +- engines/asm/e_padlock-x86_64.pl | 2 +- engines/e_afalg.c | 2 +- engines/e_afalg.h | 2 +- engines/e_afalg.txt | 2 +- engines/e_afalg_err.c | 2 +- engines/e_afalg_err.h | 2 +- engines/e_capi.c | 2 +- engines/e_capi.txt | 2 +- engines/e_capi_err.c | 2 +- engines/e_capi_err.h | 2 +- engines/e_dasync.c | 2 +- engines/e_dasync.txt | 2 +- engines/e_dasync_err.c | 2 +- engines/e_dasync_err.h | 2 +- engines/e_ossltest.c | 2 +- engines/e_ossltest.txt | 2 +- engines/e_ossltest_err.c | 2 +- engines/e_ossltest_err.h | 2 +- engines/e_padlock.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/engines/asm/e_padlock-x86.pl b/engines/asm/e_padlock-x86.pl index 5b097ce..73e72e6 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 09b0aaa..63a0532 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 f09c396..19d98d8 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 2c03c44..42b4830 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 3b79305..e32c880 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 18fe9c3..cd5b7b2 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 3eb1332..bd1dd15 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 37202b8..c3a8306 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 3f34cdf..29724e6 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 b72bc51..923723a 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 e034c98..544f7fe 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 b005f42..2e12411 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 bff64bc..9a7b498 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 794fb71..f71f6fe 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 7c2c027..844615e 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 6437624..1284742 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 2b2e31a..b16c4aa 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 920a13a..57c71e3 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 e745c1a..03f7bfb 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 4d5df7f..daf8c94 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 _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits