Fix copyrights

Add copyright to files that were missing it.
Update license from OpenSSL to Apache as needed.

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 440dc6be64aedf9674b412875f80032e68aef92f..9f9ad2a912c28e222029a1b5c90de98e10f50008 100644 (file)
--- 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 97c176c6c83554573f41448d263b9f6105a08167..30fdb9e551209055ef53c9dff63c1c624730cd9b 100644 (file)
--- 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 aa1bad26a4b8a54821eed24f9b7fb533c2b9c083..b3ed120ea0a099c19dd6906fb65f48de25ec5c0a 100644 (file)
--- a/apps/lib/engine_loader.c
+++ b/apps/lib/engine_loader.c
@@ -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/crypto/ec/curve448/arch_64/arch_intrinsics.h b/crypto/ec/curve448/arch_64/arch_intrinsics.h
index 2d9d5c7931714a1dbeb8327ecf6d874919e91bfa..e12b8cf22624025dcb8ec463a00715133c49fa84 100644 (file)
--- 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 12bdb841ba153c121639bc64abf20832d17e6dec..faaeb8d9944b53dcb1cd85a13200458cf5b58219 100644 (file)
--- 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 7653545ee723020d2458753791ce419b0ede1bb5..8f7a7dd391bd8d6e1b01a36079b01e3e5958efc4 100644 (file)
--- 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 99b1e3b0035a22d2ad5615cfdadbfb21131af314..85fe7704fde27a616a5e22ee4ef6a1f27600bfb7 100644 (file)
--- 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 cbe4438695361dd24d6618b1583829b0ed833bf2..7d890d1c0b85cddc57fef8b0578e8b66ca7daf79 100644 (file)
--- 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 840dc18f064460c0a1a2a51ba1367cf61984db15..2cb4253d6a1462e3c7acab61d8da920428747eaa 100644 (file)
--- 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 7e908efaaf4004f20c9af7c17b54f3baa081fdfc..18e8a59baf6b39c323c46d016a53c8351434c6ea 100644 (file)
--- 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 bd955df8f2523395a088b6a2dc432fba4282221f..7251a9e1367e13e06b117b4a183243cbc48d42c2 100644 (file)
--- 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 84b677a40f5bf1c99fae43b5f164d0a8b184f3ab..2c90294aefadf1938d0788423a0f72fa46e4e0e2 100644 (file)
--- 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 d55a69273f4bcf6e89d2567ca8803405b3c669f7..417103b81b8326f55f2203578266d6c24041b214 100644 (file)
--- 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 72d1b451ae5cf73d1acffd29d9fd790cf6328fc1..be258044be97cd149d62e7d0da5c9b48caf9e408 100644 (file)
--- 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 3e43848495f21615374ca0e342162f1c0165389c..eafac3879347931cb23a0ea6e28edca4c36f089a 100644 (file)
--- 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 e3cd714d1c90c74a62b6c8ab4a0ec2b46dee44e9..3695ee7ad14ad4b4be74a457b82ad24b613f0f70 100644 (file)
--- 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 f90e11f04ae12e0392f2af49cba9caf1622fe01b..f3f173c42c9475c03594547f804eaf35eaa54178 100644 (file)
--- 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 006ea0b16c5882dff08aad03b9f4ea4c9ccd29cf..07e23b440ea0d2084733111534b0b8a0399d8999 100644 (file)
--- 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 58eb09a3e4653c78170d0f6b80dd4dc5356bf61f..b142e0df0c466e34c9dc09e47978ed1fa8580c7f 100644 (file)
--- 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 790ec7e10a6e7bf8262d7b2c405b263a790d02bf..685a2e1d2677ddf7baf1c85f51437f90d66b82f0 100644 (file)
--- 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 33d23d4b7104b9f557d5b03e1fdb41bc885b5f4a..d73ae66fa536afb517bea61e85331bf7384845b1 100644 (file)
--- 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 2aefea82b0f9e373e65463bc166c22713b2e8f84..1497f8476fca64211991d0bb7114f6dfc8c7d53f 100644 (file)
--- 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