1 files changed, 113 insertions, 1 deletions
diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c
index 3f914a75fa..a8a038e515 100644
--- a/src/lib/libcrypto/comp/comp_lib.c
+++ b/src/lib/libcrypto/comp/comp_lib.c
@@ -1,4 +1,116 @@
-/* $OpenBSD: comp_lib.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */
+/* $OpenBSD: comp_lib.c,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */
+/*
+ * ---------------------------------------------------------------------------
+ * Patches to this file were contributed by
+ * Ben Laurie <ben@openssl.org> and Ulf Moeller <ulf@openssl.org>.
+ * ---------------------------------------------------------------------------
+ * Copyright (c) 1999 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.
+ *
+ * ---------------------------------------------------------------------------
+ * Parts of this file are derived from SSLeay code
+ * which is covered by the following Copyright and license:
+ * ---------------------------------------------------------------------------
+ * Copyright (c) 1998 Eric Young <eay@cryptsoft.com>
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young <eay@cryptsoft.com>.
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson <tjh@cryptsoft.com>.
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given
+ * attribution as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * 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 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 acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young <eay@cryptsoft.com>"
+ *    The word 'cryptographic' can be left out if the rouines from the
+ *    library being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof)
+ *    from the apps directory (application code) you must include an
+ *    acknowledgement: "This product includes software written
+ *    by Tim Hudson <tjh@cryptsoft.com>"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS 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 AUTHOR OR 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.
+ *
+ * The licence and distribution terms for any publically available version
+ * or derivative of this code cannot be changed.  i.e. this code cannot
+ * simply be copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c index 3f914a75fa..a8a038e515 100644 --- a/src/lib/libcrypto/comp/comp_lib.c +++ b/src/lib/libcrypto/comp/comp_lib.c
@@ -1,4 +1,116 @@
1	/* $OpenBSD: comp_lib.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */	1	/* $OpenBSD: comp_lib.c,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */
		2	/*
		3	* ---------------------------------------------------------------------------
		4	* Patches to this file were contributed by
		5	* Ben Laurie <ben@openssl.org> and Ulf Moeller <ulf@openssl.org>.
		6	* ---------------------------------------------------------------------------
		7	* Copyright (c) 1999 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	*
		53	* ---------------------------------------------------------------------------
		54	* Parts of this file are derived from SSLeay code
		55	* which is covered by the following Copyright and license:
		56	* ---------------------------------------------------------------------------
		57	* Copyright (c) 1998 Eric Young <eay@cryptsoft.com>
		58	* All rights reserved.
		59	*
		60	* This package is an SSL implementation written
		61	* by Eric Young <eay@cryptsoft.com>.
		62	* The implementation was written so as to conform with Netscapes SSL.
		63	*
		64	* This library is free for commercial and non-commercial use as long as
		65	* the following conditions are aheared to. The following conditions
		66	* apply to all code found in this distribution, be it the RC4, RSA,
		67	* lhash, DES, etc., code; not just the SSL code. The SSL documentation
		68	* included with this distribution is covered by the same copyright terms
		69	* except that the holder is Tim Hudson <tjh@cryptsoft.com>.
		70	*
		71	* Copyright remains Eric Young's, and as such any Copyright notices in
		72	* the code are not to be removed.
		73	* If this package is used in a product, Eric Young should be given
		74	* attribution as the author of the parts of the library used.
		75	* This can be in the form of a textual message at program startup or
		76	* in documentation (online or textual) provided with the package.
		77	*
		78	* Redistribution and use in source and binary forms, with or without
		79	* modification, are permitted provided that the following conditions
		80	* are met:
		81	* 1. Redistributions of source code must retain the copyright
		82	* notice, this list of conditions and the following disclaimer.
		83	* 2. Redistributions in binary form must reproduce the above copyright
		84	* notice, this list of conditions and the following disclaimer in the
		85	* documentation and/or other materials provided with the distribution.
		86	* 3. All advertising materials mentioning features or use of this software
		87	* must display the following acknowledgement:
		88	* "This product includes cryptographic software written by
		89	* Eric Young <eay@cryptsoft.com>"
		90	* The word 'cryptographic' can be left out if the rouines from the
		91	* library being used are not cryptographic related :-).
		92	* 4. If you include any Windows specific code (or a derivative thereof)
		93	* from the apps directory (application code) you must include an
		94	* acknowledgement: "This product includes software written
		95	* by Tim Hudson <tjh@cryptsoft.com>"
		96	*
		97	* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
		98	* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		99	* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		100	* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
		101	* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
		102	* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
		103	* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
		104	* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
		105	* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
		106	* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		107	* SUCH DAMAGE.
		108	*
		109	* The licence and distribution terms for any publically available version
		110	* or derivative of this code cannot be changed. i.e. this code cannot
		111	* simply be copied and put under another distribution licence
		112	* [including the GNU Public Licence.]
		113	*/
2	#include <stdio.h>	114	#include <stdio.h>
3	#include <stdlib.h>	115	#include <stdlib.h>
4	#include <string.h>	116	#include <string.h>