Following the license change, modify the boilerplates in apps/

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

diff --git a/apps/CA.pl.in b/apps/CA.pl.in
index db3cc383189e6ac4c8d873baabf2433731fb0930..12c9452444f8c5047ff882dfa3493110235f2bfd 100644 (file)
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -1,7 +1,7 @@
 #!{- $config{HASHBANGPERL} -}
 # Copyright 2000-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/apps/app_rand.c b/apps/app_rand.c
index 2b0bbde034230416f2814cd2de11a4a15b4940d0..1861343a9c2cd91db39f4d03d02e8b9920fee64f 100644 (file)
--- a/apps/app_rand.c
+++ b/apps/app_rand.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/apps.c b/apps/apps.c
index 653e3973e04da7d4ce3de1f4ece0fc8e192ee41e..c00fdcd8365d0ee5e675f2565a6bbda57e323527 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/apps.h b/apps/apps.h
index d9eb650eb21197a10696d5320c2c2e3016514635..04f078994b334385ca9624ffc71c0d8131cfd018 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/asn1pars.c b/apps/asn1pars.c
index 62c70b9cc4405e97581316e025241d80e614082b..4c1ce485440abf9c0e38e867dc0aac63ad4a3fc5 100644 (file)
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/bf_prefix.c b/apps/bf_prefix.c
index bae3c91bf8b385494ec0ffba1a6ee92b5266a052..8cedca90ce1e319f1e9b090e108e8cb2d1fc3281 100644 (file)
--- a/apps/bf_prefix.c
+++ b/apps/bf_prefix.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 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/apps/ca.c b/apps/ca.c
index 69207c0662ed7f16f5c1f87f52ac80bf58a0c099..b4ac86d4aac95e418eaf179616a08679ec552dbc 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/ciphers.c b/apps/ciphers.c
index 0bb33a4aca4ba8a166e502e26e6958d4df905f5c..cc71e50049f305569b1c79f85e9d354b33b10f9e 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/cms.c b/apps/cms.c
index e9d760c999b78f51f873aad243cf662469bf2710..8402a272e2ecfe76c6804ac6ca71298fe6c33b9e 100644 (file)
--- a/apps/cms.c
+++ b/apps/cms.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/apps/crl.c b/apps/crl.c
index 031fada14c8436b556a08425c854028ed6a91f89..49ad97b77468449ac283722e6b9b277aeab78b86 100644 (file)
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/crl2p7.c b/apps/crl2p7.c
index 88fabcb22c3618031690789b75a926c99ab0fd3f..6f284cb10e5617f49f3cfc6659c743a0bd7deb80 100644 (file)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/dgst.c b/apps/dgst.c
index d158a0ccb2843af199467d4dde07b66d02aaf1ae..34494a404aeef250317e7b5bba413e84e3d9beea 100644 (file)
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/dhparam.c b/apps/dhparam.c
index 13f76754d27cbe027558b9170f29032fd65f7529..b13a34ad9bfbc398ae42132848f89f258fea7cf0 100644 (file)
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/dsa.c b/apps/dsa.c
index 6022e64cd4cebecbb710f4dbaa85e0e6a235ddca..629ba1d9e39bc386933c1a1b485dc7b49c9c96da 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/dsaparam.c b/apps/dsaparam.c
index b227b76a372362d1b7ebce98d5ed2c888a939923..70135a694cdade608dcb72e0baf10dc232a1037c 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/ec.c b/apps/ec.c
index 03abb00683373b8ea0565af9412d1ed332508e40..c09d29d3783e828891e74e33a688e72939d185f2 100644 (file)
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2002-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/apps/ecparam.c b/apps/ecparam.c
index 917f1a86b2e36c238afe631bc24f8b681037a902..24fda049b7c4255cdf6f7825e71e8f2182a7b182 100644 (file)
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -2,7 +2,7 @@
  * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. 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/apps/enc.c b/apps/enc.c
index 8e5a57d3e5d74d72410a68cef3445641aad48191..fbc3664da8c7ac17e04c478753a991727dad7a7b 100644 (file)
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/engine.c b/apps/engine.c
index 83f9588a0ab19fca3c45269e8f5e9af766ea20a1..8444fe2df6fd9fda8d3dfd6415a70479436c122d 100644 (file)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000-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/apps/errstr.c b/apps/errstr.c
index 3ef01f076a8c322e6deb9b124359a99532c41086..df0253c41649682b879c00ae0e9aea439dc89321 100644 (file)
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/gendsa.c b/apps/gendsa.c
index 401375420bffada2387947cd1f6025a9854996e1..c44311b536733b706e5ab6776feb0135ce6a3bd6 100644 (file)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/genpkey.c b/apps/genpkey.c
index 39fa73c91cf4ddc418260b7dd3b0392365666d24..f8faf3ba941636433f39ea4a17729a75dcf23269 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2006-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/apps/genrsa.c b/apps/genrsa.c
index c17cd147154eea5c78915b0bb1ee8552d1026abd..6477bcd6f75a92c04be7a2642aa307c49d712ff4 100644 (file)
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/nseq.c b/apps/nseq.c
index a067c915926f2f427ffb9876b53c670a9e9cb9ae..6c883c0f706d78c377e66876b2745e8d7091fa79 100644 (file)
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-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/apps/ocsp.c b/apps/ocsp.c
index 7fd78624bbcca18c614c5a7cf6f7eaa93ee233cb..c129e9e514c8b05d22a7eb93ac4467005ed5fab3 100644 (file)
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2001-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/apps/openssl.c b/apps/openssl.c
index 67b75e4cfd532b972526dae60525a0e89a7fe045..3747b1aa7a2563f4308ee25bf8bcd541d989fa17 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/opt.c b/apps/opt.c
index 666856535d5ed4329e5acddbf14b99f27ba1f7f8..c6ccceebcfa2008d88183c5f07f84b4286f00284 100644 (file)
--- a/apps/opt.c
+++ b/apps/opt.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/apps/passwd.c b/apps/passwd.c
index aa516c874e656fca0f3ed4df803417be51cea1ce..956623653f5b0c33497ed24968f250210b0a28cb 100644 (file)
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000-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/apps/pkcs12.c b/apps/pkcs12.c
index c8fc452ec6d2e7baa5ac595e62d63c7902971e48..94d6661c3f27bc63bd4bfeaa4cdff05aaaf098ea 100644 (file)
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-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/apps/pkcs7.c b/apps/pkcs7.c
index c3e9f5c692608e09cf9b07b810f84f3cd974931e..a385f90980757ab32525cf216d921f5839c51006 100644 (file)
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/pkcs8.c b/apps/pkcs8.c
index 205536560ac13413de476e306390c88a418c2b01..26ab0eefe6836a20ae07ae6cc303457a92cf1bab 100644 (file)
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-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/apps/pkey.c b/apps/pkey.c
index 0dd5590bdc0bc7cc63a3500a2c7c879146048ff1..0806b4e045bddd0f7a6e54f0f42cfa51295c0421 100644 (file)
--- a/apps/pkey.c
+++ b/apps/pkey.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2006-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/apps/pkeyparam.c b/apps/pkeyparam.c
index 41c3f532b3450fa55ac62d724fe7cec8c151cffc..1b037aea8b6c5cd671d673ce4e26f1e2d8801f1d 100644 (file)
--- a/apps/pkeyparam.c
+++ b/apps/pkeyparam.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2006-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/apps/pkeyutl.c b/apps/pkeyutl.c
index 38fd6249e3690b2b1cf7c351b860052799f9775e..8ee4a304dd3a05bc48f1e22c6816008214fb635c 100644 (file)
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2006-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/apps/prime.c b/apps/prime.c
index 6944797646962c369f3f7bed27c7f4086282c270..e00a3084a1df58afdaa1e7c1235a97b34609cb2b 100644 (file)
--- a/apps/prime.c
+++ b/apps/prime.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

diff --git a/apps/progs.pl b/apps/progs.pl
index 57671405dda007dff588246e67e50b6f23d7d443..ab1a729fffb9692f5b9e88a7206575a06df7a6d5 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 1995-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
@@ -45,7 +45,7 @@ print <<"EOF";
  *
  * Copyright 1995-$YEAR 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/apps/rand.c b/apps/rand.c
index 4c6181507bd5af6de183cd8004d1e8579d59441f..b35b84ae275d65bf92917470ae6fbe9509c6761b 100644 (file)
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1998-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/apps/rehash.c b/apps/rehash.c
index bb41d3129f9c518566bb4c1f072d803c6856b87a..6a641a8542bad4ff13cdff90a087cbf2250460df 100644 (file)
--- a/apps/rehash.c
+++ b/apps/rehash.c
@@ -2,7 +2,7 @@
  * Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2013-2014 Timo Teräs <timo.teras@gmail.com>
  *
- * 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/apps/req.c b/apps/req.c
index 6fd28a2aba240656e8480921d7d584fc6b321df8..67dc0c8c415296697773513a060287093a947dee 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/rsa.c b/apps/rsa.c
index fdd02dce32419a764ac7e7b7fc9eaa4fd4b80409..78958e053e58230a5080de03722944d03058a198 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/rsautl.c b/apps/rsautl.c
index 5da8504d3c061fe8bceb693fff2c8154725b30a9..df90c01ea90b29d86fcfd5ac9d64d76b0543efae 100644 (file)
--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2000-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/apps/s_apps.h b/apps/s_apps.h
index 0a3bc962808be2ab6360c1942465c58522de8fba..d941ccd9971d76771d05315bb9a661ba4f48a250 100644 (file)
--- a/apps/s_apps.h
+++ b/apps/s_apps.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/s_cb.c b/apps/s_cb.c
index 2d4568f40ccbc1eeb8d20fc2b5e15666c7e432cc..af57c34558684d4bc027d1471b63d5e4f7a316ab 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/s_client.c b/apps/s_client.c
index dcaa10cf44ebae4de0d828dcd4508692ad26526a..8a7613d5c7c0d6b1e91494fb7164ad9eece5cff7 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -2,7 +2,7 @@
  * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. 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/apps/s_server.c b/apps/s_server.c
index 15b4b430da762af4efc212596d21ea6bb9d4321c..692116137a864c83fbe3d148d06f4b978407aa3f 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved
  * Copyright 2005 Nokia. 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/apps/s_socket.c b/apps/s_socket.c
index 76f9289002076254ad84be0f863498d4297c84ee..7dd95e9f0ec2cf1a3c9f7fc87d614fda8a406fab 100644 (file)
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/s_time.c b/apps/s_time.c
index 82d40a5a513246acf7e47642a4864bc6e489bed9..e436b57ad02b45af1e3ff5d9dc0ede7b8c6a3509 100644 (file)
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/sess_id.c b/apps/sess_id.c
index 8fd584f3b131196025126cc2fee213e22e37ef4b..d8e1827776854b8880e036d643dd3d807368ea75 100644 (file)
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/smime.c b/apps/smime.c
index 6fd473775f45a4ac7fb49823c8e4949be391d82d..0f99e0a5e92fae5518fd358852daf409f0d13716 100644 (file)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-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/apps/speed.c b/apps/speed.c
index 08ddad0213adb4e0975c7186d3309d004edab1c0..437c03e38d65a610d3d8cbe80dab3c51437b2910 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2,7 +2,7 @@
  * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2002, Oracle and/or its affiliates. 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/apps/spkac.c b/apps/spkac.c
index f384af6eb60b0bbc82fa9886fefb0ba2c73b01e0..0ac644dd208a00a000830a6f3dbdd8537a48e85d 100644 (file)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-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/apps/srp.c b/apps/srp.c
index 689574a4854c846866805d174369a96e8c499d7e..e9d9b67b79ff6a951f101c7c7b0ac47020ded376 100644 (file)
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -2,7 +2,7 @@
  * Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright (c) 2004, EdelKey Project. 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/apps/storeutl.c b/apps/storeutl.c
index 50007f6e8b69eea044a55ebe9a39c4ce75c2d3b1..bc212c6b7c74a6ad353b6067a89351fdadad7d83 100644 (file)
--- a/apps/storeutl.c
+++ b/apps/storeutl.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/apps/testdsa.h b/apps/testdsa.h
index 3c4b459db117e822fc6f557b87f1d79ca7a28bb9..b7d288a66b32d5e633ef5b854839dabf60179e48 100644 (file)
--- a/apps/testdsa.h
+++ b/apps/testdsa.h
@@ -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/apps/testrsa.h b/apps/testrsa.h
index 1350ce54e3fbadaa037a9fa3c0d20e17260a1db6..8c3a967414c6c421d5595d78e8e240495ce16569 100644 (file)
--- a/apps/testrsa.h
+++ b/apps/testrsa.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/timeouts.h b/apps/timeouts.h
index e023b0aa49209ac6ed36a9cc821cfa701d082b46..932be1cc30d85491cc5185e9a4bd14f3741cf313 100644 (file)
--- a/apps/timeouts.h
+++ b/apps/timeouts.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 1999-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/apps/ts.c b/apps/ts.c
index 930c1daaab6d4369a82ceb192acae2b9880c7e1d..63c5210183bc1d8a6ea7d15e322e4185893f32a8 100644 (file)
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2006-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/apps/tsget.in b/apps/tsget.in
index bec365e28ce546a5bec093ba671788a55c3cadad..604b4caa405a602ed4b99c4bc816efcd2959e6a2 100644 (file)
--- a/apps/tsget.in
+++ b/apps/tsget.in
@@ -2,7 +2,7 @@
 # Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2002 The OpenTSA Project. 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/apps/verify.c b/apps/verify.c
index 38377a57e4a9f7ad5bfc2b968453e2554726d31f..3768feda81de1dad5640ff32d04edcf87609e199 100644 (file)
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/version.c b/apps/version.c
index 515a1076511bf00ddf246f547a4f5e4a5ec4e827..f9d280c72387a81c73d616b60c2928ba354be8fc 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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/apps/vms_decc_init.c b/apps/vms_decc_init.c
index f83f7168efe56e7549bc6130784eb5d25581a855..c26442e440c7324d258b702d5b8055a4400dc450 100644 (file)
--- a/apps/vms_decc_init.c
+++ b/apps/vms_decc_init.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2010-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/apps/vms_term_sock.c b/apps/vms_term_sock.c
index 9a90a1e7901254212a9dc148b4de38f65da9c39d..6d55a83859bb30e27e7558f9a783e4cf12fefeef 100644 (file)
--- a/apps/vms_term_sock.c
+++ b/apps/vms_term_sock.c
@@ -2,7 +2,7 @@
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2016 VMS Software, Inc. 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/apps/vms_term_sock.h b/apps/vms_term_sock.h
index c4d1702d799ecc7d7c0a8138a21df10519aaa36a..d4c7c3d16076fff96cdeef19c93b3522b99bb5d7 100644 (file)
--- a/apps/vms_term_sock.h
+++ b/apps/vms_term_sock.h
@@ -2,7 +2,7 @@
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2016 VMS Software, Inc. 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/apps/win32_init.c b/apps/win32_init.c
index df4bff41a24dea4df475c4fa361d5646d1ec342d..8836b3ba3913a059d7bf380c5a83af4ff22bea14 100644 (file)
--- a/apps/win32_init.c
+++ b/apps/win32_init.c
@@ -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/apps/x509.c b/apps/x509.c
index 81291a9a4f90f2c01fe5bbfd5f2bbd2531a671e1..e9de4950f9cb09c494dd7e8c141e6ab4e8779ff4 100644 (file)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-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