mirror of https://github.com/openssl/openssl.git
				
				
				
			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)
This commit is contained in:
		
							parent
							
								
									78212c6472
								
							
						
					
					
						commit
						9d987de3aa
					
				|  | @ -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 \ | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
|  | @ -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 | ||||
| 
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
|  | @ -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 | ||||
| 
 | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
|  | @ -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 | ||||
| 
 | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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 } | ||||
|  |  | |||
|  | @ -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) | ||||
|  |  | |||
|  | @ -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 | ||||
|  */ | ||||
|  |  | |||
|  | @ -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> | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
|  | @ -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
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue