Following the license change, modify the boilerplates in fuzz/

[skip ci]

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

diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 9d23d4774a26f8120fc7f63f08d187a70b6c1437..83a1e7ae6c9254986a2f2e79e5ebe9c8fcdcd5bf 100644 (file)
--- a/fuzz/asn1.c
+++ b/fuzz/asn1.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/asn1parse.c b/fuzz/asn1parse.c
index cf5ef72a13cf99cc24fb537a34f5b53895ed6786..8aab0d2f1c66ccbe900e032d2b3b1ee06768b282 100644 (file)
--- a/fuzz/asn1parse.c
+++ b/fuzz/asn1parse.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/bignum.c b/fuzz/bignum.c
index c5136601b1b1f714cd3d72bb0369a0a0174095db..3de6a89846b69e3b97bc146ec1fb733fd8b0dc87 100644 (file)
--- a/fuzz/bignum.c
+++ b/fuzz/bignum.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/bndiv.c b/fuzz/bndiv.c
index e9c70bbd4c5b1c5916b66f776471ce650a271fd2..70636d4fee596718be013fb24f115ea471079494 100644 (file)
--- a/fuzz/bndiv.c
+++ b/fuzz/bndiv.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/client.c b/fuzz/client.c
index 7ce609ca6a033be31ba44462d358d33b342f07fc..5483c6a00bffcb0bd568fffcff8b3868cb70406c 100644 (file)
--- a/fuzz/client.c
+++ b/fuzz/client.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/cms.c b/fuzz/cms.c
index 959ef9365ad1f60c1d0405bf78dfa4bfaa0274d5..479ce02e0315fac6ece0f28c580f5a9be38c00fa 100644 (file)
--- a/fuzz/cms.c
+++ b/fuzz/cms.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/conf.c b/fuzz/conf.c
index 87fe857099b8482beaab2eafbb2d6c28c24a2651..0739080f0f521e53b9f235f50c421719fe097297 100644 (file)
--- a/fuzz/conf.c
+++ b/fuzz/conf.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/crl.c b/fuzz/crl.c
index e4b0192f051b3f73b46d297df001abfdb60f63c5..e174180c9ee79e195e5705382dab137e9e107b1e 100644 (file)
--- a/fuzz/crl.c
+++ b/fuzz/crl.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/ct.c b/fuzz/ct.c
index 72dd798711baa09c3adff95e3a4b24e4d3c677be..a735fff85e2bf090493785c4b6910dda0e935d2f 100644 (file)
--- a/fuzz/ct.c
+++ b/fuzz/ct.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/driver.c b/fuzz/driver.c
index 54d67de202db882bb0e1fca5b5c583bc99044986..337b8de5eb517590cde4307d6289517a494acd24 100644 (file)
--- a/fuzz/driver.c
+++ b/fuzz/driver.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/fuzzer.h b/fuzz/fuzzer.h
index fcc0d25279fc80aef1cdecdf71d98ed2dc2b37ab..b4605f8c8f37e2a50255d8b67a7f657f7a4520f2 100644 (file)
--- a/fuzz/fuzzer.h
+++ b/fuzz/fuzzer.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/helper.py b/fuzz/helper.py
index e83ea00c001ad3d2b1e05877b70f433e6a22bea1..9185b17228bb0d091e50091d1d4eb3247f11f95c 100755 (executable)
--- a/fuzz/helper.py
+++ b/fuzz/helper.py
@@ -2,7 +2,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/fuzz/mkfuzzoids.pl b/fuzz/mkfuzzoids.pl
index 0153a031a67803b4390da4351cfcf2532a0712b6..89cf7bb583dfd45635133b1699ca5be98bce8b9c 100755 (executable)
--- a/fuzz/mkfuzzoids.pl
+++ b/fuzz/mkfuzzoids.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

diff --git a/fuzz/rand.inc b/fuzz/rand.inc
index f8b3277b94e121c32056f80a2d09c62af437980c..d0eebff896c2d2d9b781978f87f79a699dc638c0 100644 (file)
--- a/fuzz/rand.inc
+++ b/fuzz/rand.inc
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/server.c b/fuzz/server.c
index 2d392ac886aeb37bb0afd30b480fbd59ed7990f0..953da48f5bea4796b0b0580b0e318fa4e7cdee0a 100644 (file)
--- a/fuzz/server.c
+++ b/fuzz/server.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/test-corpus.c b/fuzz/test-corpus.c
index 86be5337e134a1484bfd0f48fe56ef63e55d53f7..a2b76ea866970462629e32d724da7af9f9ca16d8 100644 (file)
--- a/fuzz/test-corpus.c
+++ b/fuzz/test-corpus.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html

diff --git a/fuzz/x509.c b/fuzz/x509.c
index 926287da48617665eb947d25711841cfbb06cf02..3dbeb236e339925a4325b6fc4689d370388dafa7 100644 (file)
--- a/fuzz/x509.c
+++ b/fuzz/x509.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL licenses, (the "License");
+ * Licensed under the Apache License 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * https://www.openssl.org/source/license.html