Reinstate the licenses that were replaced with license stubs in

OpenSSL commits d2e9e320186f0917cc940f46bdf1a7e4120da9b0 and b6cff313cbb1d0381b329fe4f6a8f009cdb270e4
author: tb <> 2022-05-04 18:47:26 +0000
committer: tb <> 2022-05-04 18:47:26 +0000
commit: e58588d4097ff3da18f3d4df55de566cf6773db2 (patch)
tree: 6815104a01ea75d66f0aa3edf383a510427c0a2d
parent: 817dde8411ac20e1e608e392780107f2be50da85 (diff)
download: openbsd-e58588d4097ff3da18f3d4df55de566cf6773db2.tar.gz
openbsd-e58588d4097ff3da18f3d4df55de566cf6773db2.tar.bz2
openbsd-e58588d4097ff3da18f3d4df55de566cf6773db2.zip
2 files changed, 100 insertions, 12 deletions
diff --git a/src/lib/libcrypto/kdf/hkdf_evp.c b/src/lib/libcrypto/kdf/hkdf_evp.c
index 25bf4b729f..b3d0d7a0db 100644
--- a/src/lib/libcrypto/kdf/hkdf_evp.c
+++ b/src/lib/libcrypto/kdf/hkdf_evp.c
@@ -1,10 +1,49 @@
-/*
+/* ====================================================================
- * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright (c) 2016 The OpenSSL Project.  All rights reserved.
 *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Redistribution and use in source and binary forms, with or without
- * this file except in compliance with the License.  You can obtain a copy
+ * modification, are permitted provided that the following conditions
- * in the file LICENSE in the source distribution or at
+ * are met:
- * https://www.openssl.org/source/license.html
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <stdlib.h>
diff --git a/src/lib/libcrypto/kdf/kdf_err.c b/src/lib/libcrypto/kdf/kdf_err.c
index 1627c0a394..eb2ec57ae6 100644
--- a/src/lib/libcrypto/kdf/kdf_err.c
+++ b/src/lib/libcrypto/kdf/kdf_err.c
@@ -1,11 +1,60 @@
+/* ====================================================================
+ * Copyright (c) 1999-2016 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
 /*
 * 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
- * 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/err.h>
author	tb <>	2022-05-04 18:47:26 +0000
committer	tb <>	2022-05-04 18:47:26 +0000
commit	e58588d4097ff3da18f3d4df55de566cf6773db2 (patch)
tree	6815104a01ea75d66f0aa3edf383a510427c0a2d
parent	817dde8411ac20e1e608e392780107f2be50da85 (diff)
download	openbsd-e58588d4097ff3da18f3d4df55de566cf6773db2.tar.gz openbsd-e58588d4097ff3da18f3d4df55de566cf6773db2.tar.bz2 openbsd-e58588d4097ff3da18f3d4df55de566cf6773db2.zip

diff --git a/src/lib/libcrypto/kdf/hkdf_evp.c b/src/lib/libcrypto/kdf/hkdf_evp.c index 25bf4b729f..b3d0d7a0db 100644 --- a/src/lib/libcrypto/kdf/hkdf_evp.c +++ b/src/lib/libcrypto/kdf/hkdf_evp.c
@@ -1,10 +1,49 @@
1	/*	1	/* ====================================================================
2	* Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.	2	* Copyright (c) 2016 The OpenSSL Project. All rights reserved.
3	*	3	*
4	* Licensed under the OpenSSL license (the "License"). You may not use	4	* Redistribution and use in source and binary forms, with or without
5	* this file except in compliance with the License. You can obtain a copy	5	* modification, are permitted provided that the following conditions
6	* in the file LICENSE in the source distribution or at	6	* are met:
7	* https://www.openssl.org/source/license.html	7	*
		8	* 1. Redistributions of source code must retain the above copyright
		9	* notice, this list of conditions and the following disclaimer.
		10	*
		11	* 2. Redistributions in binary form must reproduce the above copyright
		12	* notice, this list of conditions and the following disclaimer in
		13	* the documentation and/or other materials provided with the
		14	* distribution.
		15	*
		16	* 3. All advertising materials mentioning features or use of this
		17	* software must display the following acknowledgment:
		18	* "This product includes software developed by the OpenSSL Project
		19	* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
		20	*
		21	* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		22	* endorse or promote products derived from this software without
		23	* prior written permission. For written permission, please contact
		24	* openssl-core@openssl.org.
		25	*
		26	* 5. Products derived from this software may not be called "OpenSSL"
		27	* nor may "OpenSSL" appear in their names without prior written
		28	* permission of the OpenSSL Project.
		29	*
		30	* 6. Redistributions of any form whatsoever must retain the following
		31	* acknowledgment:
		32	* "This product includes software developed by the OpenSSL Project
		33	* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
		34	*
		35	* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		36	* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		37	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		38	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
		39	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		40	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		41	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		42	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		43	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
		44	* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		45	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
		46	* OF THE POSSIBILITY OF SUCH DAMAGE.
8	*/	47	*/
9		48
10	#include <stdlib.h>	49	#include <stdlib.h>


diff --git a/src/lib/libcrypto/kdf/kdf_err.c b/src/lib/libcrypto/kdf/kdf_err.c index 1627c0a394..eb2ec57ae6 100644 --- a/src/lib/libcrypto/kdf/kdf_err.c +++ b/src/lib/libcrypto/kdf/kdf_err.c
@@ -1,11 +1,60 @@
		1	/* ====================================================================
		2	* Copyright (c) 1999-2016 The OpenSSL Project. All rights reserved.
		3	*
		4	* Redistribution and use in source and binary forms, with or without
		5	* modification, are permitted provided that the following conditions
		6	* are met:
		7	*
		8	* 1. Redistributions of source code must retain the above copyright
		9	* notice, this list of conditions and the following disclaimer.
		10	*
		11	* 2. Redistributions in binary form must reproduce the above copyright
		12	* notice, this list of conditions and the following disclaimer in
		13	* notice, this list of conditions and the following disclaimer in
		14	* the documentation and/or other materials provided with the
		15	* distribution.
		16	*
		17	* 3. All advertising materials mentioning features or use of this
		18	* software must display the following acknowledgment:
		19	* "This product includes software developed by the OpenSSL Project
		20	* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
		21	*
		22	* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
		23	* endorse or promote products derived from this software without
		24	* prior written permission. For written permission, please contact
		25	* openssl-core@OpenSSL.org.
		26	*
		27	* 5. Products derived from this software may not be called "OpenSSL"
		28	* nor may "OpenSSL" appear in their names without prior written
		29	* permission of the OpenSSL Project.
		30	*
		31	* 6. Redistributions of any form whatsoever must retain the following
		32	* acknowledgment:
		33	* "This product includes software developed by the OpenSSL Project
		34	* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
		35	*
		36	* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
		37	* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		38	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
		39	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
		40	* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
		41	* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
		42	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		43	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		44	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
		45	* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		46	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
		47	* OF THE POSSIBILITY OF SUCH DAMAGE.
		48	* ====================================================================
		49	*
		50	* This product includes cryptographic software written by Eric Young
		51	* (eay@cryptsoft.com). This product includes software written by Tim
		52	* Hudson (tjh@cryptsoft.com).
		53	*
		54	*/
		55
1	/*	56	/*
2	* Generated by util/mkerr.pl DO NOT EDIT	57	* Generated by util/mkerr.pl DO NOT EDIT
3	* Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
4	*
5	* Licensed under the OpenSSL license (the "License"). You may not use
6	* this file except in compliance with the License. You can obtain a copy
7	* in the file LICENSE in the source distribution or at
8	* https://www.openssl.org/source/license.html
9	*/	58	*/
10		59
11	#include <openssl/err.h>	60	#include <openssl/err.h>