From 5e73e6baac4a84198519267c17abefd52fa55e93 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 6 Dec 2018 14:08:15 +0100 Subject: [PATCH] Following the license change, modify the boilerplates in demos/ [skip ci] Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/7834) --- demos/bio/client-arg.c | 2 +- demos/bio/client-conf.c | 2 +- demos/bio/saccept.c | 2 +- demos/bio/sconnect.c | 2 +- demos/bio/server-arg.c | 2 +- demos/bio/server-cmod.c | 2 +- demos/bio/server-conf.c | 2 +- demos/cms/cms_comp.c | 2 +- demos/cms/cms_ddec.c | 2 +- demos/cms/cms_dec.c | 2 +- demos/cms/cms_denc.c | 2 +- demos/cms/cms_enc.c | 2 +- demos/cms/cms_sign.c | 2 +- demos/cms/cms_sign2.c | 2 +- demos/cms/cms_uncomp.c | 2 +- demos/cms/cms_ver.c | 2 +- demos/evp/aesccm.c | 2 +- demos/evp/aesgcm.c | 2 +- demos/pkcs12/pkread.c | 2 +- demos/pkcs12/pkwrite.c | 2 +- demos/smime/smdec.c | 2 +- demos/smime/smenc.c | 2 +- demos/smime/smsign.c | 2 +- demos/smime/smsign2.c | 2 +- demos/smime/smver.c | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c index e8d5e46ab5..976fefff5d 100644 --- a/demos/bio/client-arg.c +++ b/demos/bio/client-arg.c @@ -1,7 +1,7 @@ /* * Copyright 2013-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/demos/bio/client-conf.c b/demos/bio/client-conf.c index e819030eec..84edc796dc 100644 --- a/demos/bio/client-conf.c +++ b/demos/bio/client-conf.c @@ -1,7 +1,7 @@ /* * Copyright 2013-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/demos/bio/saccept.c b/demos/bio/saccept.c index de86ae6322..6da22ea440 100644 --- a/demos/bio/saccept.c +++ b/demos/bio/saccept.c @@ -1,7 +1,7 @@ /* * Copyright 1998-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/demos/bio/sconnect.c b/demos/bio/sconnect.c index db71f29afe..7e46bf0ad8 100644 --- a/demos/bio/sconnect.c +++ b/demos/bio/sconnect.c @@ -1,7 +1,7 @@ /* * Copyright 1998-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/demos/bio/server-arg.c b/demos/bio/server-arg.c index d80d070f7a..60a87725a9 100644 --- a/demos/bio/server-arg.c +++ b/demos/bio/server-arg.c @@ -1,7 +1,7 @@ /* * Copyright 2013-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/demos/bio/server-cmod.c b/demos/bio/server-cmod.c index f1079ad329..3642fbacf6 100644 --- a/demos/bio/server-cmod.c +++ b/demos/bio/server-cmod.c @@ -1,7 +1,7 @@ /* * Copyright 2015-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/demos/bio/server-conf.c b/demos/bio/server-conf.c index 4d1655bfc9..5e07a15e7b 100644 --- a/demos/bio/server-conf.c +++ b/demos/bio/server-conf.c @@ -1,7 +1,7 @@ /* * Copyright 2013-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/demos/cms/cms_comp.c b/demos/cms/cms_comp.c index 0d548f93ca..ee1b5a38ce 100644 --- a/demos/cms/cms_comp.c +++ b/demos/cms/cms_comp.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c index 8f2e9aecb2..cb6c2694c6 100644 --- a/demos/cms/cms_ddec.c +++ b/demos/cms/cms_ddec.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_dec.c b/demos/cms/cms_dec.c index 4f9428b4e7..f33ef1eb78 100644 --- a/demos/cms/cms_dec.c +++ b/demos/cms/cms_dec.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_denc.c b/demos/cms/cms_denc.c index adba69b96d..60b0aa192b 100644 --- a/demos/cms/cms_denc.c +++ b/demos/cms/cms_denc.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_enc.c b/demos/cms/cms_enc.c index 4d17d720c6..9ef7a39558 100644 --- a/demos/cms/cms_enc.c +++ b/demos/cms/cms_enc.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_sign.c b/demos/cms/cms_sign.c index 15bd5b8dd9..a52f5cec0f 100644 --- a/demos/cms/cms_sign.c +++ b/demos/cms/cms_sign.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c index 14ebf27775..beda9779a3 100644 --- a/demos/cms/cms_sign2.c +++ b/demos/cms/cms_sign2.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_uncomp.c b/demos/cms/cms_uncomp.c index 3e3b4c4c6e..35e68ebcc6 100644 --- a/demos/cms/cms_uncomp.c +++ b/demos/cms/cms_uncomp.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/cms/cms_ver.c b/demos/cms/cms_ver.c index 43c10e2513..cd2b01e1b0 100644 --- a/demos/cms/cms_ver.c +++ b/demos/cms/cms_ver.c @@ -1,7 +1,7 @@ /* * Copyright 2008-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/demos/evp/aesccm.c b/demos/evp/aesccm.c index cc4d0b5ee9..5045837c74 100644 --- a/demos/evp/aesccm.c +++ b/demos/evp/aesccm.c @@ -1,7 +1,7 @@ /* * Copyright 2013-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/demos/evp/aesgcm.c b/demos/evp/aesgcm.c index 46d9a5639b..4decdaa17f 100644 --- a/demos/evp/aesgcm.c +++ b/demos/evp/aesgcm.c @@ -1,7 +1,7 @@ /* * Copyright 2012-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/demos/pkcs12/pkread.c b/demos/pkcs12/pkread.c index 3f7913b2ae..992b42c09d 100644 --- a/demos/pkcs12/pkread.c +++ b/demos/pkcs12/pkread.c @@ -1,7 +1,7 @@ /* * Copyright 2000-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/demos/pkcs12/pkwrite.c b/demos/pkcs12/pkwrite.c index e14cf8327d..e9ad8cde26 100644 --- a/demos/pkcs12/pkwrite.c +++ b/demos/pkcs12/pkwrite.c @@ -1,7 +1,7 @@ /* * Copyright 2000-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/demos/smime/smdec.c b/demos/smime/smdec.c index c4d1b090d9..debcedd5e8 100644 --- a/demos/smime/smdec.c +++ b/demos/smime/smdec.c @@ -1,7 +1,7 @@ /* * Copyright 2007-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/demos/smime/smenc.c b/demos/smime/smenc.c index 5d36e9a497..0714dddfd2 100644 --- a/demos/smime/smenc.c +++ b/demos/smime/smenc.c @@ -1,7 +1,7 @@ /* * Copyright 2007-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/demos/smime/smsign.c b/demos/smime/smsign.c index ba0adb3974..ac2c27b525 100644 --- a/demos/smime/smsign.c +++ b/demos/smime/smsign.c @@ -1,7 +1,7 @@ /* * Copyright 2007-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/demos/smime/smsign2.c b/demos/smime/smsign2.c index 2b7f45b294..a9e7025748 100644 --- a/demos/smime/smsign2.c +++ b/demos/smime/smsign2.c @@ -1,7 +1,7 @@ /* * Copyright 2007-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/demos/smime/smver.c b/demos/smime/smver.c index 75411c40d0..601462a041 100644 --- a/demos/smime/smver.c +++ b/demos/smime/smver.c @@ -1,7 +1,7 @@ /* * Copyright 2007-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 -- 2.34.1