[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Thu Dec 6 14:27:50 UTC 2018
The branch master has been updated
via 5c0d0c86af11807e4eafbbfca9dd7f74ac77ef96 (commit)
from 4fc56f902236a94f09a3d4d7b061a64bdee76779 (commit)
- Log -----------------------------------------------------------------
commit 5c0d0c86af11807e4eafbbfca9dd7f74ac77ef96
Author: Richard Levitte <levitte at openssl.org>
Date: Thu Dec 6 13:58:30 2018 +0100
Following the license change, modify the boilerplates in crypto/store/
[skip ci]
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7821)
-----------------------------------------------------------------------
Summary of changes:
crypto/store/loader_file.c | 2 +-
crypto/store/store_err.c | 2 +-
crypto/store/store_init.c | 2 +-
crypto/store/store_lib.c | 2 +-
crypto/store/store_locl.h | 2 +-
crypto/store/store_register.c | 2 +-
crypto/store/store_strings.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c
index 632e451..cac8698 100644
--- a/crypto/store/loader_file.c
+++ b/crypto/store/loader_file.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/crypto/store/store_err.c b/crypto/store/store_err.c
index 5a8a840..254defc 100644
--- a/crypto/store/store_err.c
+++ b/crypto/store/store_err.c
@@ -2,7 +2,7 @@
* Generated by util/mkerr.pl DO NOT EDIT
* 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/crypto/store/store_init.c b/crypto/store/store_init.c
index b398bf5..db050c0 100644
--- a/crypto/store/store_init.c
+++ b/crypto/store/store_init.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/crypto/store/store_lib.c b/crypto/store/store_lib.c
index 1c43547..ebe9182 100644
--- a/crypto/store/store_lib.c
+++ b/crypto/store/store_lib.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/crypto/store/store_locl.h b/crypto/store/store_locl.h
index 369dcb3..c53d451 100644
--- a/crypto/store/store_locl.h
+++ b/crypto/store/store_locl.h
@@ -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/crypto/store/store_register.c b/crypto/store/store_register.c
index e68cb3c..3022e36 100644
--- a/crypto/store/store_register.c
+++ b/crypto/store/store_register.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/crypto/store/store_strings.c b/crypto/store/store_strings.c
index 76cf316..84cfdcf 100644
--- a/crypto/store/store_strings.c
+++ b/crypto/store/store_strings.c
@@ -1,7 +1,7 @@
/*
* Copyright 2016-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
More information about the openssl-commits
mailing list