[openssl] master update
Richard Levitte
levitte at openssl.org
Tue Sep 7 11:35:53 UTC 2021
The branch master has been updated
via a8d9bd8114510d3a1708da3922f07e7f707674bc (commit)
from 95a444c9adcad04035704ab3b5d749a185ef0960 (commit)
- Log -----------------------------------------------------------------
commit a8d9bd8114510d3a1708da3922f07e7f707674bc
Author: Richard Levitte <levitte at openssl.org>
Date: Tue Sep 7 13:29:33 2021 +0200
Update copyright year
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16534)
(cherry picked from commit 54d987b92ce57c1cc38c6d9b6bf879b003f4cbd4)
-----------------------------------------------------------------------
Summary of changes:
Configurations/shared-info.pl | 2 +-
crypto/asn1/a_print.c | 2 +-
crypto/asn1/t_spki.c | 2 +-
crypto/cmp/cmp_status.c | 2 +-
dev/release-aux/release-state-fn.sh | 2 +-
doc/internal/man3/ossl_method_construct.pod | 2 +-
doc/internal/man7/deprecation.pod | 2 +-
doc/man7/EVP_KDF-X942-CONCAT.pod | 2 +-
doc/man7/passphrase-encoding.pod | 2 +-
providers/implementations/ciphers/cipher_camellia.c | 2 +-
ssl/ssl_stat.c | 2 +-
test/cmp_status_test.c | 2 +-
test/destest.c | 2 +-
test/recipes/30-test_evp_data/evpciph_aes_cts.txt | 2 +-
test/recipes/30-test_evp_data/evpkdf_scrypt.txt | 2 +-
test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt | 2 +-
test/recipes/80-test_cipherbytes.t | 2 +-
test/recipes/80-test_cipherlist.t | 2 +-
test/recipes/80-test_ciphername.t | 2 +-
test/rsa_sp800_56b_test.c | 2 +-
test/x509_internal_test.c | 2 +-
21 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Configurations/shared-info.pl b/Configurations/shared-info.pl
index abf2d98dcc..edd16f4055 100644
--- a/Configurations/shared-info.pl
+++ b/Configurations/shared-info.pl
@@ -1,6 +1,6 @@
#! /usr/bin/env perl
# -*- mode: perl; -*-
-# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/crypto/asn1/a_print.c b/crypto/asn1/a_print.c
index e04f9b1f2e..d2768f74bd 100644
--- a/crypto/asn1/a_print.c
+++ b/crypto/asn1/a_print.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c
index 3d85e08686..0397f1f9ee 100644
--- a/crypto/asn1/t_spki.c
+++ b/crypto/asn1/t_spki.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
diff --git a/crypto/cmp/cmp_status.c b/crypto/cmp/cmp_status.c
index f1e7b4bc02..46be6b6899 100644
--- a/crypto/cmp/cmp_status.c
+++ b/crypto/cmp/cmp_status.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
diff --git a/dev/release-aux/release-state-fn.sh b/dev/release-aux/release-state-fn.sh
index 635b82a8b9..267d8753d5 100644
--- a/dev/release-aux/release-state-fn.sh
+++ b/dev/release-aux/release-state-fn.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/doc/internal/man3/ossl_method_construct.pod b/doc/internal/man3/ossl_method_construct.pod
index b05ea9845c..46a17ba7b6 100644
--- a/doc/internal/man3/ossl_method_construct.pod
+++ b/doc/internal/man3/ossl_method_construct.pod
@@ -147,7 +147,7 @@ This functionality was added to OpenSSL 3.0.
=head1 COPYRIGHT
-Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
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
diff --git a/doc/internal/man7/deprecation.pod b/doc/internal/man7/deprecation.pod
index e0efa75ce4..13a4b059a0 100644
--- a/doc/internal/man7/deprecation.pod
+++ b/doc/internal/man7/deprecation.pod
@@ -130,7 +130,7 @@ L<openssl_user_macros(7)>
=head1 COPYRIGHT
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
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
diff --git a/doc/man7/EVP_KDF-X942-CONCAT.pod b/doc/man7/EVP_KDF-X942-CONCAT.pod
index 8463b958f3..52e84579bf 100644
--- a/doc/man7/EVP_KDF-X942-CONCAT.pod
+++ b/doc/man7/EVP_KDF-X942-CONCAT.pod
@@ -25,7 +25,7 @@ This functionality was added to OpenSSL 3.0.
=head1 COPYRIGHT
-Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
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
diff --git a/doc/man7/passphrase-encoding.pod b/doc/man7/passphrase-encoding.pod
index ed580fecac..35a2545dda 100644
--- a/doc/man7/passphrase-encoding.pod
+++ b/doc/man7/passphrase-encoding.pod
@@ -170,7 +170,7 @@ L<d2i_PKCS8PrivateKey_bio(3)>
=head1 COPYRIGHT
-Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
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
diff --git a/providers/implementations/ciphers/cipher_camellia.c b/providers/implementations/ciphers/cipher_camellia.c
index 5f0607a199..b119666aa8 100644
--- a/providers/implementations/ciphers/cipher_camellia.c
+++ b/providers/implementations/ciphers/cipher_camellia.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 32bc4326b4..f2316f7c98 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2005 Nokia. All rights reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
diff --git a/test/cmp_status_test.c b/test/cmp_status_test.c
index 09a8e69181..96f9336b84 100644
--- a/test/cmp_status_test.c
+++ b/test/cmp_status_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright Nokia 2007-2019
* Copyright Siemens AG 2015-2019
*
diff --git a/test/destest.c b/test/destest.c
index d2f3cfe6a7..ee5a70db27 100644
--- a/test/destest.c
+++ b/test/destest.c
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
diff --git a/test/recipes/30-test_evp_data/evpciph_aes_cts.txt b/test/recipes/30-test_evp_data/evpciph_aes_cts.txt
index 106eec403f..c7503eaed8 100644
--- a/test/recipes/30-test_evp_data/evpciph_aes_cts.txt
+++ b/test/recipes/30-test_evp_data/evpciph_aes_cts.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/test/recipes/30-test_evp_data/evpkdf_scrypt.txt b/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
index 29ae89b5be..469755c542 100644
--- a/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt b/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
index c9c7f3ca78..e61e5a14f1 100644
--- a/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
+++ b/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
@@ -1,5 +1,5 @@
#
-# Copyright 2001-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2001-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/test/recipes/80-test_cipherbytes.t b/test/recipes/80-test_cipherbytes.t
index dc576fdcbd..69c4220004 100644
--- a/test/recipes/80-test_cipherbytes.t
+++ b/test/recipes/80-test_cipherbytes.t
@@ -1,6 +1,6 @@
#! /usr/bin/env perl
#
-# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/test/recipes/80-test_cipherlist.t b/test/recipes/80-test_cipherlist.t
index 2deda30eec..2d62898dff 100644
--- a/test/recipes/80-test_cipherlist.t
+++ b/test/recipes/80-test_cipherlist.t
@@ -1,6 +1,6 @@
#! /usr/bin/env perl
#
-# Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# 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
diff --git a/test/recipes/80-test_ciphername.t b/test/recipes/80-test_ciphername.t
index a3227cee4d..1a9db5d4cf 100644
--- a/test/recipes/80-test_ciphername.t
+++ b/test/recipes/80-test_ciphername.t
@@ -1,6 +1,6 @@
#! /usr/bin/env perl
#
-# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
# Copyright 2017 BaishanCloud. All rights reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
diff --git a/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c
index f5df0e4955..b17dafe399 100644
--- a/test/rsa_sp800_56b_test.c
+++ b/test/rsa_sp800_56b_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index a63293d5ed..be43537329 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
*
* 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
More information about the openssl-commits
mailing list