[openssl] openssl-3.0 update
tomas at openssl.org
tomas at openssl.org
Thu Feb 3 12:59:57 UTC 2022
The branch openssl-3.0 has been updated
via 73c55cc89a98a7e9aa3287ffa2faad19ffd78685 (commit)
from 86818e77bc46916db99bda6962c79dd11215e886 (commit)
- Log -----------------------------------------------------------------
commit 73c55cc89a98a7e9aa3287ffa2faad19ffd78685
Author: Todd Short <tshort at akamai.com>
Date: Thu Jan 27 14:18:28 2022 -0500
Fix copyrights
Add copyright to files that were missing it.
Update license from OpenSSL to Apache as needed.
Reviewed-by: Matt Caswell <matt at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17606)
(cherry picked from commit 9d987de3aabe54e65a55649a61953966f33b070b)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 2 +-
apps/include/engine_loader.h | 4 ++--
apps/lib/engine_loader.c | 2 +-
crypto/ec/curve448/arch_64/arch_intrinsics.h | 4 ++--
crypto/ec/curve448/arch_64/f_impl.h | 4 ++--
crypto/ec/curve448/arch_64/f_impl64.c | 4 ++--
crypto/evp/mac_meth.c | 9 +++++++++
crypto/objects/obj_compat.h | 8 ++++++++
include/crypto/pem.h | 4 ++--
os-dep/haiku.h | 9 +++++++++
providers/common/der/DIGESTS.asn1 | 7 +++++++
providers/common/der/DSA.asn1 | 7 +++++++
providers/common/der/EC.asn1 | 7 +++++++
providers/common/der/ECX.asn1 | 6 ++++++
providers/common/der/NIST.asn1 | 7 +++++++
providers/common/der/RSA.asn1 | 7 +++++++
providers/common/der/SM2.asn1 | 7 +++++++
providers/common/der/wrap.asn1 | 7 +++++++
providers/implementations/keymgmt/ec_kmgmt_imexport.inc | 9 +++++++++
test/defltfips_test.c | 9 +++++++++
test/pbetest.c | 4 ++--
test/sm3_internal_test.c | 4 ++--
22 files changed, 115 insertions(+), 16 deletions(-)
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 6d4039c33f..6be0018fc3 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1153,7 +1153,7 @@ generate_crypto_objects:
crypto/objects/obj_mac.num \
crypto/objects/obj_xref.txt \
> crypto/objects/obj_xref.h )
- ( cd $(SRCDIR); cat crypto/objects/obj_compat.h >> include/openssl/obj_mac.h )
+ ( cd $(SRCDIR); sed -e '1,8d' crypto/objects/obj_compat.h >> include/openssl/obj_mac.h )
generate_crypto_conf:
( cd $(SRCDIR); $(PERL) crypto/conf/keysets.pl \
diff --git a/apps/include/engine_loader.h b/apps/include/engine_loader.h
index 11598639a5..fa80fc9656 100644
--- a/apps/include/engine_loader.h
+++ b/apps/include/engine_loader.h
@@ -1,7 +1,7 @@
/*
- * Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2022 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/lib/engine_loader.c b/apps/lib/engine_loader.c
index b2a11d438d..4d3a397b41 100644
--- a/apps/lib/engine_loader.c
+++ b/apps/lib/engine_loader.c
@@ -1,7 +1,7 @@
/*
* Copyright 2018-2021 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/ec/curve448/arch_64/arch_intrinsics.h b/crypto/ec/curve448/arch_64/arch_intrinsics.h
index 2d9d5c7931..e12b8cf226 100644
--- a/crypto/ec/curve448/arch_64/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_64/arch_intrinsics.h
@@ -1,8 +1,8 @@
/*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2016 Cryptography Research, Inc.
*
- * 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/ec/curve448/arch_64/f_impl.h b/crypto/ec/curve448/arch_64/f_impl.h
index 12bdb841ba..faaeb8d994 100644
--- a/crypto/ec/curve448/arch_64/f_impl.h
+++ b/crypto/ec/curve448/arch_64/f_impl.h
@@ -1,8 +1,8 @@
/*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2014-2016 Cryptography Research, Inc.
*
- * 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/ec/curve448/arch_64/f_impl64.c b/crypto/ec/curve448/arch_64/f_impl64.c
index 7653545ee7..8f7a7dd391 100644
--- a/crypto/ec/curve448/arch_64/f_impl64.c
+++ b/crypto/ec/curve448/arch_64/f_impl64.c
@@ -1,8 +1,8 @@
/*
- * Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2017-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2014 Cryptography Research, Inc.
*
- * 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/evp/mac_meth.c b/crypto/evp/mac_meth.c
index 99b1e3b003..85fe7704fd 100644
--- a/crypto/evp/mac_meth.c
+++ b/crypto/evp/mac_meth.c
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2022 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 LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/core.h>
diff --git a/crypto/objects/obj_compat.h b/crypto/objects/obj_compat.h
index cbe4438695..7d890d1c0b 100644
--- a/crypto/objects/obj_compat.h
+++ b/crypto/objects/obj_compat.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright 2022 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 LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
#ifndef OPENSSL_NO_DEPRECATED_3_0
diff --git a/include/crypto/pem.h b/include/crypto/pem.h
index 840dc18f06..2cb4253d6a 100644
--- a/include/crypto/pem.h
+++ b/include/crypto/pem.h
@@ -1,7 +1,7 @@
/*
- * Copyright 2018-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2018-2022 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/os-dep/haiku.h b/os-dep/haiku.h
index 7e908efaaf..18e8a59baf 100644
--- a/os-dep/haiku.h
+++ b/os-dep/haiku.h
@@ -1,2 +1,11 @@
+/*
+ * Copyright 2022 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 LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
#include <sys/select.h>
#include <sys/time.h>
diff --git a/providers/common/der/DIGESTS.asn1 b/providers/common/der/DIGESTS.asn1
index bd955df8f2..7251a9e136 100644
--- a/providers/common/der/DIGESTS.asn1
+++ b/providers/common/der/DIGESTS.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
-- -------------------------------------------------------------------
-- From https://tools.ietf.org/html/rfc4055#section-2.1
diff --git a/providers/common/der/DSA.asn1 b/providers/common/der/DSA.asn1
index 84b677a40f..2c90294aef 100644
--- a/providers/common/der/DSA.asn1
+++ b/providers/common/der/DSA.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
-- -------------------------------------------------------------------
-- Taken from RFC 3279, 3 ASN.1 Module
-- (https://www.rfc-editor.org/rfc/rfc3279.html#section-3)
diff --git a/providers/common/der/EC.asn1 b/providers/common/der/EC.asn1
index d55a69273f..417103b81b 100644
--- a/providers/common/der/EC.asn1
+++ b/providers/common/der/EC.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
-- -------------------------------------------------------------------
-- Taken from RFC 3279, 3 ASN.1 Module
-- (https://www.rfc-editor.org/rfc/rfc3279.html#section-3)
diff --git a/providers/common/der/ECX.asn1 b/providers/common/der/ECX.asn1
index 72d1b451ae..be258044be 100644
--- a/providers/common/der/ECX.asn1
+++ b/providers/common/der/ECX.asn1
@@ -1,3 +1,9 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
-- -------------------------------------------------------------------
-- Taken from RFC 8410, 9 ASN.1 Module
diff --git a/providers/common/der/NIST.asn1 b/providers/common/der/NIST.asn1
index 3e43848495..eafac38793 100644
--- a/providers/common/der/NIST.asn1
+++ b/providers/common/der/NIST.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
-- -------------------------------------------------------------------
-- Taken from https://csrc.nist.gov/projects/computer-security-objects-register/algorithm-registration
diff --git a/providers/common/der/RSA.asn1 b/providers/common/der/RSA.asn1
index e3cd714d1c..3695ee7ad1 100644
--- a/providers/common/der/RSA.asn1
+++ b/providers/common/der/RSA.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
-- -------------------------------------------------------------------
-- Taken from RFC 8017, Appendix C
-- (https://www.rfc-editor.org/rfc/rfc8017.html#appendix-C)
diff --git a/providers/common/der/SM2.asn1 b/providers/common/der/SM2.asn1
index f90e11f04a..f3f173c42c 100644
--- a/providers/common/der/SM2.asn1
+++ b/providers/common/der/SM2.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
oscca OBJECT IDENTIFIER ::= { iso(1) member-body(2) cn(156) 10197 }
sm-scheme OBJECT IDENTIFIER ::= { oscca 1 }
diff --git a/providers/common/der/wrap.asn1 b/providers/common/der/wrap.asn1
index 006ea0b16c..07e23b440e 100644
--- a/providers/common/der/wrap.asn1
+++ b/providers/common/der/wrap.asn1
@@ -1,3 +1,10 @@
+-- Copyright 2022 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 LICENSE in the source distribution or at
+-- https://www.openssl.org/source/license.html
+
-- -------------------------------------------------------------------
-- Taken from RFC 3370, Section 4.3.1 Triple-DES Key Wrap
-- (https://tools.ietf.org/html/rfc3370)
diff --git a/providers/implementations/keymgmt/ec_kmgmt_imexport.inc b/providers/implementations/keymgmt/ec_kmgmt_imexport.inc
index 58eb09a3e4..b142e0df0c 100644
--- a/providers/implementations/keymgmt/ec_kmgmt_imexport.inc
+++ b/providers/implementations/keymgmt/ec_kmgmt_imexport.inc
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2022 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 LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+*/
+
/*
* This file is meant to be included from ec_kmgmt.c
*/
diff --git a/test/defltfips_test.c b/test/defltfips_test.c
index 8b6dc0d6f1..9def654c5d 100644
--- a/test/defltfips_test.c
+++ b/test/defltfips_test.c
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2022 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 LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
#include <string.h>
#include <openssl/evp.h>
#include <openssl/provider.h>
diff --git a/test/pbetest.c b/test/pbetest.c
index 33d23d4b71..d73ae66fa5 100644
--- a/test/pbetest.c
+++ b/test/pbetest.c
@@ -1,7 +1,7 @@
/*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2022 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/test/sm3_internal_test.c b/test/sm3_internal_test.c
index 2aefea82b0..1497f8476f 100644
--- a/test/sm3_internal_test.c
+++ b/test/sm3_internal_test.c
@@ -1,8 +1,8 @@
/*
- * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2021-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2021 UnionTech. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apche 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