[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Thu Dec 6 14:37:44 UTC 2018
The branch master has been updated
via 0642931f3013976ac4c6dc30b46740d486dae087 (commit)
from ab3fa1c0ad5f01c8c86495227efb61c20c7972fa (commit)
- Log -----------------------------------------------------------------
commit 0642931f3013976ac4c6dc30b46740d486dae087
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Dec 6 14:07:47 2018 +0100
Following the license change, modify the boilerplates in fuzz/
[skip ci]
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7833)
-----------------------------------------------------------------------
Summary of changes:
fuzz/asn1.c | 2 +-
fuzz/asn1parse.c | 2 +-
fuzz/bignum.c | 2 +-
fuzz/bndiv.c | 2 +-
fuzz/client.c | 2 +-
fuzz/cms.c | 2 +-
fuzz/conf.c | 2 +-
fuzz/crl.c | 2 +-
fuzz/ct.c | 2 +-
fuzz/driver.c | 2 +-
fuzz/fuzzer.h | 2 +-
fuzz/helper.py | 2 +-
fuzz/mkfuzzoids.pl | 2 +-
fuzz/rand.inc | 2 +-
fuzz/server.c | 2 +-
fuzz/test-corpus.c | 2 +-
fuzz/x509.c | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/fuzz/asn1.c b/fuzz/asn1.c
index 9d23d47..83a1e7a 100644
--- 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 cf5ef72..8aab0d2 100644
--- 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 c513660..3de6a89 100644
--- 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 e9c70bb..70636d4 100644
--- 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 7ce609c..5483c6a 100644
--- 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 959ef93..479ce02 100644
--- 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 87fe857..0739080 100644
--- 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 e4b0192..e174180 100644
--- 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 72dd798..a735fff 100644
--- 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 54d67de..337b8de 100644
--- 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 fcc0d25..b4605f8 100644
--- 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 e83ea00..9185b17 100755
--- 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 0153a03..89cf7bb 100755
--- 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 f8b3277..d0eebff 100644
--- 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 2d392ac..953da48 100644
--- 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 86be533..a2b76ea 100644
--- 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 926287d..3dbeb23 100644
--- 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
More information about the openssl-commits
mailing list