Reinstate the licenses that were replaced with a license stub

in OpenSSL commit d2e9e320.
author: tb <> 2021-12-18 16:58:20 +0000
committer: tb <> 2021-12-18 16:58:20 +0000
commit: a8c00fc65440138a52588aadfce6635eb1384218 (patch)
tree: 49bbc368ae6af8bfcd93d8c82ed004057cb34efa
parent: 24614f714a9871c46cac65dd404e46b591fb9263 (diff)
download: openbsd-a8c00fc65440138a52588aadfce6635eb1384218.tar.gz
openbsd-a8c00fc65440138a52588aadfce6635eb1384218.tar.bz2
openbsd-a8c00fc65440138a52588aadfce6635eb1384218.zip
2 files changed, 108 insertions, 12 deletions
diff --git a/src/lib/libcrypto/x509/x509_addr.c b/src/lib/libcrypto/x509/x509_addr.c
index ddb0e4af12..d543bddd7d 100644
--- a/src/lib/libcrypto/x509/x509_addr.c
+++ b/src/lib/libcrypto/x509/x509_addr.c
@@ -1,11 +1,59 @@
-/*      $OpenBSD: x509_addr.c,v 1.19 2021/11/01 20:53:08 tb Exp $ */
+/*      $OpenBSD: x509_addr.c,v 1.20 2021/12/18 16:58:20 tb Exp $ */
 /*
- * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Contributed to the OpenSSL Project by the American Registry for
+ * Internet Numbers ("ARIN").
+ */
+/* ====================================================================
+ * Copyright (c) 2006-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
+ *    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
+ *    licensing@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.
+ * ====================================================================
 *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * This product includes cryptographic software written by Eric Young
- * this file except in compliance with the License.  You can obtain a copy
+ * (eay@cryptsoft.com).  This product includes software written by Tim
- * in the file LICENSE in the source distribution or at
+ * Hudson (tjh@cryptsoft.com).
- * https://www.openssl.org/source/license.html
 */
 /*
diff --git a/src/lib/libcrypto/x509/x509_asid.c b/src/lib/libcrypto/x509/x509_asid.c
index d2247e09c1..8d664465c7 100644
--- a/src/lib/libcrypto/x509/x509_asid.c
+++ b/src/lib/libcrypto/x509/x509_asid.c
@@ -1,11 +1,59 @@
-/*      $OpenBSD: x509_asid.c,v 1.19 2021/11/01 20:53:08 tb Exp $ */
+/*      $OpenBSD: x509_asid.c,v 1.20 2021/12/18 16:58:20 tb Exp $ */
 /*
- * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Contributed to the OpenSSL Project by the American Registry for
+ * Internet Numbers ("ARIN").
+ */
+/* ====================================================================
+ * Copyright (c) 2006-2018 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
+ *    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
+ *    licensing@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.
+ * ====================================================================
 *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * This product includes cryptographic software written by Eric Young
- * this file except in compliance with the License.  You can obtain a copy
+ * (eay@cryptsoft.com).  This product includes software written by Tim
- * in the file LICENSE in the source distribution or at
+ * Hudson (tjh@cryptsoft.com).
- * https://www.openssl.org/source/license.html
 */
 /*
author	tb <>	2021-12-18 16:58:20 +0000
committer	tb <>	2021-12-18 16:58:20 +0000
commit	a8c00fc65440138a52588aadfce6635eb1384218 (patch)
tree	49bbc368ae6af8bfcd93d8c82ed004057cb34efa
parent	24614f714a9871c46cac65dd404e46b591fb9263 (diff)
download	openbsd-a8c00fc65440138a52588aadfce6635eb1384218.tar.gz openbsd-a8c00fc65440138a52588aadfce6635eb1384218.tar.bz2 openbsd-a8c00fc65440138a52588aadfce6635eb1384218.zip

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


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