diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/comp/c_rle.c | 114 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/c_zlib.c | 116 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp.h | 115 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp_err.c | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp_lib.c | 114 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp_local.h | 115 |
6 files changed, 570 insertions, 9 deletions
diff --git a/src/lib/libcrypto/comp/c_rle.c b/src/lib/libcrypto/comp/c_rle.c index 93b2f3c71b..4808bb7bde 100644 --- a/src/lib/libcrypto/comp/c_rle.c +++ b/src/lib/libcrypto/comp/c_rle.c | |||
| @@ -1,4 +1,116 @@ | |||
| 1 | /* $OpenBSD: c_rle.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */ | 1 | /* $OpenBSD: c_rle.c,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */ |
| 2 | /* | ||
| 3 | * --------------------------------------------------------------------------- | ||
| 4 | * Patches to this file were contributed by | ||
| 5 | * Ulf Moeller <ulf@openssl.org> and Bodo Moeller <bodo@openssl.org>. | ||
| 6 | * --------------------------------------------------------------------------- | ||
| 7 | * Copyright (c) 1999, 2011 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> |
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c index bdcd7e0f35..efcf9ba7a3 100644 --- a/src/lib/libcrypto/comp/c_zlib.c +++ b/src/lib/libcrypto/comp/c_zlib.c | |||
| @@ -1,4 +1,118 @@ | |||
| 1 | /* $OpenBSD: c_zlib.c,v 1.22 2022/01/14 08:40:57 tb Exp $ */ | 1 | /* $OpenBSD: c_zlib.c,v 1.23 2022/12/23 23:23:02 schwarze Exp $ */ |
| 2 | /* | ||
| 3 | * --------------------------------------------------------------------------- | ||
| 4 | * Major patches to this file were contributed by | ||
| 5 | * Richard Levitte <levitte@openssl.org>, Nils Larsch <nils@openssl.org>, | ||
| 6 | * and Dr. Stephen Henson <steve@openssl.org>. | ||
| 7 | * --------------------------------------------------------------------------- | ||
| 8 | * Copyright (c) 2002, 2003, 2007, 2008, 2010 The OpenSSL Project. | ||
| 9 | * All rights reserved. | ||
| 10 | * | ||
| 11 | * Redistribution and use in source and binary forms, with or without | ||
| 12 | * modification, are permitted provided that the following conditions | ||
| 13 | * are met: | ||
| 14 | * | ||
| 15 | * 1. Redistributions of source code must retain the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer. | ||
| 17 | * | ||
| 18 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 19 | * notice, this list of conditions and the following disclaimer in | ||
| 20 | * the documentation and/or other materials provided with the | ||
| 21 | * distribution. | ||
| 22 | * | ||
| 23 | * 3. All advertising materials mentioning features or use of this | ||
| 24 | * software must display the following acknowledgment: | ||
| 25 | * "This product includes software developed by the OpenSSL Project | ||
| 26 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 27 | * | ||
| 28 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 29 | * endorse or promote products derived from this software without | ||
| 30 | * prior written permission. For written permission, please contact | ||
| 31 | * licensing@OpenSSL.org. | ||
| 32 | * | ||
| 33 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 34 | * nor may "OpenSSL" appear in their names without prior written | ||
| 35 | * permission of the OpenSSL Project. | ||
| 36 | * | ||
| 37 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 38 | * acknowledgment: | ||
| 39 | * "This product includes software developed by the OpenSSL Project | ||
| 40 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 41 | * | ||
| 42 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 43 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 44 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 45 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 46 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 47 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 48 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 49 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 50 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 51 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 52 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 53 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 54 | * | ||
| 55 | * --------------------------------------------------------------------------- | ||
| 56 | * Parts of this file are derived from SSLeay code | ||
| 57 | * which is covered by the following Copyright and license: | ||
| 58 | * --------------------------------------------------------------------------- | ||
| 59 | * Copyright (c) 1998 Eric Young <eay@cryptsoft.com> | ||
| 60 | * All rights reserved. | ||
| 61 | * | ||
| 62 | * This package is an SSL implementation written | ||
| 63 | * by Eric Young <eay@cryptsoft.com>. | ||
| 64 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 65 | * | ||
| 66 | * This library is free for commercial and non-commercial use as long as | ||
| 67 | * the following conditions are aheared to. The following conditions | ||
| 68 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 69 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 70 | * included with this distribution is covered by the same copyright terms | ||
| 71 | * except that the holder is Tim Hudson <tjh@cryptsoft.com>. | ||
| 72 | * | ||
| 73 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 74 | * the code are not to be removed. | ||
| 75 | * If this package is used in a product, Eric Young should be given | ||
| 76 | * attribution as the author of the parts of the library used. | ||
| 77 | * This can be in the form of a textual message at program startup or | ||
| 78 | * in documentation (online or textual) provided with the package. | ||
| 79 | * | ||
| 80 | * Redistribution and use in source and binary forms, with or without | ||
| 81 | * modification, are permitted provided that the following conditions | ||
| 82 | * are met: | ||
| 83 | * 1. Redistributions of source code must retain the copyright | ||
| 84 | * notice, this list of conditions and the following disclaimer. | ||
| 85 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 86 | * notice, this list of conditions and the following disclaimer in the | ||
| 87 | * documentation and/or other materials provided with the distribution. | ||
| 88 | * 3. All advertising materials mentioning features or use of this software | ||
| 89 | * must display the following acknowledgement: | ||
| 90 | * "This product includes cryptographic software written by | ||
| 91 | * Eric Young <eay@cryptsoft.com>" | ||
| 92 | * The word 'cryptographic' can be left out if the rouines from the | ||
| 93 | * library being used are not cryptographic related :-). | ||
| 94 | * 4. If you include any Windows specific code (or a derivative thereof) | ||
| 95 | * from the apps directory (application code) you must include an | ||
| 96 | * acknowledgement: "This product includes software written | ||
| 97 | * by Tim Hudson <tjh@cryptsoft.com>" | ||
| 98 | * | ||
| 99 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 100 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 101 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 102 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 103 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 104 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 105 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 106 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 107 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 108 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 109 | * SUCH DAMAGE. | ||
| 110 | * | ||
| 111 | * The licence and distribution terms for any publically available version | ||
| 112 | * or derivative of this code cannot be changed. i.e. this code cannot | ||
| 113 | * simply be copied and put under another distribution licence | ||
| 114 | * [including the GNU Public Licence.] | ||
| 115 | */ | ||
| 2 | #include <stdio.h> | 116 | #include <stdio.h> |
| 3 | #include <stdlib.h> | 117 | #include <stdlib.h> |
| 4 | #include <string.h> | 118 | #include <string.h> |
diff --git a/src/lib/libcrypto/comp/comp.h b/src/lib/libcrypto/comp/comp.h index 7c99ead358..de1aaa3c71 100644 --- a/src/lib/libcrypto/comp/comp.h +++ b/src/lib/libcrypto/comp/comp.h | |||
| @@ -1,5 +1,116 @@ | |||
| 1 | /* $OpenBSD: comp.h,v 1.9 2022/01/14 08:21:12 tb Exp $ */ | 1 | /* $OpenBSD: comp.h,v 1.10 2022/12/23 23:23:02 schwarze Exp $ */ |
| 2 | 2 | /* | |
| 3 | * --------------------------------------------------------------------------- | ||
| 4 | * Patches to this file were contributed by | ||
| 5 | * Dr. Stephen Henson <steve@openssl.org>. | ||
| 6 | * --------------------------------------------------------------------------- | ||
| 7 | * Copyright (c) 1999, 2002, 2008 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 | */ | ||
| 3 | #ifndef HEADER_COMP_H | 114 | #ifndef HEADER_COMP_H |
| 4 | #define HEADER_COMP_H | 115 | #define HEADER_COMP_H |
| 5 | 116 | ||
diff --git a/src/lib/libcrypto/comp/comp_err.c b/src/lib/libcrypto/comp/comp_err.c index eb5fc0ad50..5ec5039f80 100644 --- a/src/lib/libcrypto/comp/comp_err.c +++ b/src/lib/libcrypto/comp/comp_err.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* $OpenBSD: comp_err.c,v 1.12 2022/07/12 14:42:48 kn Exp $ */ | 1 | /* $OpenBSD: comp_err.c,v 1.13 2022/12/23 23:23:02 schwarze Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | 3 | * This file was written by Dr. Stephen Henson <steve@openssl.org>. |
| 4 | * Copyright (c) 1999, 2005, 2008 The OpenSSL Project. All rights reserved. | ||
| 4 | * | 5 | * |
| 5 | * Redistribution and use in source and binary forms, with or without | 6 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions | 7 | * modification, are permitted provided that the following conditions |
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> |
diff --git a/src/lib/libcrypto/comp/comp_local.h b/src/lib/libcrypto/comp/comp_local.h index fc1888711b..5841756e73 100644 --- a/src/lib/libcrypto/comp/comp_local.h +++ b/src/lib/libcrypto/comp/comp_local.h | |||
| @@ -1,5 +1,116 @@ | |||
| 1 | /* $OpenBSD: comp_local.h,v 1.2 2022/01/14 08:21:12 tb Exp $ */ | 1 | /* $OpenBSD: comp_local.h,v 1.3 2022/12/23 23:23:02 schwarze Exp $ */ |
| 2 | 2 | /* | |
| 3 | * --------------------------------------------------------------------------- | ||
| 4 | * Patches to this file were contributed by | ||
| 5 | * Richard Levitte <levitte@openssl.org>. | ||
| 6 | * --------------------------------------------------------------------------- | ||
| 7 | * Copyright (c) 1999, 2000, 2003 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 | */ | ||
| 3 | #ifndef HEADER_COMP_LOCAL_H | 114 | #ifndef HEADER_COMP_LOCAL_H |
| 4 | #define HEADER_COMP_LOCAL_H | 115 | #define HEADER_COMP_LOCAL_H |
| 5 | 116 | ||