Following the license change, modify the boilerplates in demos/

[skip ci]

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

diff --git a/demos/bio/client-arg.c b/demos/bio/client-arg.c
index e8d5e46ab5365ddefc026820dcd5536252d49b13..976fefff5da360dbc8dc5b59153f9735e4b78c61 100644 (file)
--- 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 e819030eecf74780380f4b49c1bc211207ece4e3..84edc796dcf24ac5340dc5a66a8fb27af49ae091 100644 (file)
--- 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 de86ae6322b8a08df168b85bc68bcfe1c1386b47..6da22ea440910831a2aea9ced66db7a0b2f592fe 100644 (file)
--- 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 db71f29afe5c2c3c67929046277486471681987a..7e46bf0ad8e65571c599ead66d1ac3ea4c12a899 100644 (file)
--- 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 d80d070f7a73297dd7268c32c612332a7f17ad08..60a87725a9deeb72a7085c18f65761d045799c77 100644 (file)
--- 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 f1079ad329884e117a070425c2ed66c215be2de1..3642fbacf6cefec84b058deef004582d217f339f 100644 (file)
--- 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 4d1655bfc96dfaf7a1839d9a2337419977303254..5e07a15e7bc70be0ee04b84bba6899a7a61e8ef2 100644 (file)
--- 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 0d548f93ca8c0335d342d4606df94668a83e181b..ee1b5a38ceefd55b40a89bebb8b09d2bf13df920 100644 (file)
--- 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 8f2e9aecb21fdb06f621cdaa0bafc15be68c5c1c..cb6c2694c69790aca051b04a95be0156f6fcaffc 100644 (file)
--- 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 4f9428b4e71a8c377bf87bbcffd823bda5b5eb36..f33ef1eb78f56e29360dce21865ad5200a7a960a 100644 (file)
--- 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 adba69b96dbdca6dd59cd53092a5e2442f7eb936..60b0aa192bc008ddf2ea5bfb3136283c6e12e834 100644 (file)
--- 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 4d17d720c63b643964f2356f2aac783fada8f05e..9ef7a395583dc8191e1d1cee093631a7f3ea9e18 100644 (file)
--- 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 15bd5b8dd950b18733345d4d0ddc7a36489c7414..a52f5cec0fa5e7d1ec6241a480813e100545422a 100644 (file)
--- 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 14ebf27775203430ea0fd6e210ab628e851be3cc..beda9779a3fba71fd3149f12bf3d6bee6c116ccb 100644 (file)
--- 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 3e3b4c4c6e953509b4db1e0875281658b431da7b..35e68ebcc603af8c1bc4dae321518ba6f7a3f2cf 100644 (file)
--- 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 43c10e2513c8ad7b2c15aec722876a325422e0be..cd2b01e1b097d5cff45b5db429523c8a43d51b8d 100644 (file)
--- 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 cc4d0b5ee99abc397942f7525bb807411c4b8cee..5045837c74fab95c946eae6204aafb6443be6ed2 100644 (file)
--- 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 46d9a5639bc0dad93171a0738c91ffd021db1bfe..4decdaa17fc7ca83571306ef9f7855713fc0e3ab 100644 (file)
--- 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 3f7913b2ae36aa9777a6ec308e20fb0773339100..992b42c09ddd5900827f3f3c39ebea73fd59873e 100644 (file)
--- 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 e14cf8327d629600c73968378de58bfb95cf45ca..e9ad8cde26b77e2a9ec9f9a2f26051898ed29979 100644 (file)
--- 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 c4d1b090d9729e14354b06359838f5a74d94461d..debcedd5e866cfe9772f7c0dec27ea03f0f799fc 100644 (file)
--- 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 5d36e9a4979444a012fe37efb0fc9fde79299162..0714dddfd2c917cfff61c02df9639f1d2310e5e6 100644 (file)
--- 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 ba0adb3974bea95449116a69665106833cd0c569..ac2c27b52591b8111f8ef5c29ec8b7bee42ea5ed 100644 (file)
--- 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 2b7f45b294a2b12439e069e8e81b0ba6a84841bd..a9e70257481bda42e23eeae41630877ecee6e940 100644 (file)
--- 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 75411c40d01595a8974ccc1039a13095b4ea1593..601462a041612bdf47221b13c27168db1ab7f759 100644 (file)
--- 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