diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/comp/c_rle.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/comp/c_zlib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/comp/comp_err.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/comp/comp_lib.c | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/comp/comp_local.h | 10 |
5 files changed, 22 insertions, 4 deletions
diff --git a/src/lib/libcrypto/comp/c_rle.c b/src/lib/libcrypto/comp/c_rle.c index 7004c35029..93b2f3c71b 100644 --- a/src/lib/libcrypto/comp/c_rle.c +++ b/src/lib/libcrypto/comp/c_rle.c | |||
@@ -1,10 +1,12 @@ | |||
1 | /* $OpenBSD: c_rle.c,v 1.8 2014/11/03 16:58:28 tedu Exp $ */ | 1 | /* $OpenBSD: c_rle.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */ |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <string.h> | 4 | #include <string.h> |
5 | #include <openssl/objects.h> | 5 | #include <openssl/objects.h> |
6 | #include <openssl/comp.h> | 6 | #include <openssl/comp.h> |
7 | 7 | ||
8 | #include "comp_local.h" | ||
9 | |||
8 | static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, | 10 | static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, |
9 | unsigned int olen, unsigned char *in, unsigned int ilen); | 11 | unsigned int olen, unsigned char *in, unsigned int ilen); |
10 | static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, | 12 | static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, |
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c index 0cdbb205a4..4c527d57de 100644 --- a/src/lib/libcrypto/comp/c_zlib.c +++ b/src/lib/libcrypto/comp/c_zlib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: c_zlib.c,v 1.20 2018/03/17 16:20:01 beck Exp $ */ | 1 | /* $OpenBSD: c_zlib.c,v 1.21 2022/01/09 23:50:10 tb Exp $ */ |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <string.h> | 4 | #include <string.h> |
@@ -6,6 +6,8 @@ | |||
6 | #include <openssl/comp.h> | 6 | #include <openssl/comp.h> |
7 | #include <openssl/err.h> | 7 | #include <openssl/err.h> |
8 | 8 | ||
9 | #include "comp_local.h" | ||
10 | |||
9 | COMP_METHOD *COMP_zlib(void ); | 11 | COMP_METHOD *COMP_zlib(void ); |
10 | 12 | ||
11 | static COMP_METHOD zlib_method_nozlib = { | 13 | static COMP_METHOD zlib_method_nozlib = { |
diff --git a/src/lib/libcrypto/comp/comp_err.c b/src/lib/libcrypto/comp/comp_err.c index be8a8fc708..ccc7a28cd3 100644 --- a/src/lib/libcrypto/comp/comp_err.c +++ b/src/lib/libcrypto/comp/comp_err.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: comp_err.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */ | 1 | /* $OpenBSD: comp_err.c,v 1.11 2022/01/09 23:50:10 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -60,6 +60,8 @@ | |||
60 | #include <openssl/comp.h> | 60 | #include <openssl/comp.h> |
61 | #include <openssl/err.h> | 61 | #include <openssl/err.h> |
62 | 62 | ||
63 | #include "comp_local.h" | ||
64 | |||
63 | /* BEGIN ERROR CODES */ | 65 | /* BEGIN ERROR CODES */ |
64 | #ifndef OPENSSL_NO_ERR | 66 | #ifndef OPENSSL_NO_ERR |
65 | 67 | ||
diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c index dde238ef72..3f914a75fa 100644 --- a/src/lib/libcrypto/comp/comp_lib.c +++ b/src/lib/libcrypto/comp/comp_lib.c | |||
@@ -1,10 +1,12 @@ | |||
1 | /* $OpenBSD: comp_lib.c,v 1.8 2014/11/03 16:58:28 tedu Exp $ */ | 1 | /* $OpenBSD: comp_lib.c,v 1.9 2022/01/09 23:50:10 tb Exp $ */ |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | #include <stdlib.h> | 3 | #include <stdlib.h> |
4 | #include <string.h> | 4 | #include <string.h> |
5 | #include <openssl/objects.h> | 5 | #include <openssl/objects.h> |
6 | #include <openssl/comp.h> | 6 | #include <openssl/comp.h> |
7 | 7 | ||
8 | #include "comp_local.h" | ||
9 | |||
8 | COMP_CTX * | 10 | COMP_CTX * |
9 | COMP_CTX_new(COMP_METHOD *meth) | 11 | COMP_CTX_new(COMP_METHOD *meth) |
10 | { | 12 | { |
diff --git a/src/lib/libcrypto/comp/comp_local.h b/src/lib/libcrypto/comp/comp_local.h new file mode 100644 index 0000000000..e1dfff1251 --- /dev/null +++ b/src/lib/libcrypto/comp/comp_local.h | |||
@@ -0,0 +1,10 @@ | |||
1 | /* $OpenBSD: comp_local.h,v 1.1 2022/01/09 23:50:10 tb Exp $ */ | ||
2 | |||
3 | #ifndef HEADER_COMP_LOCAL_H | ||
4 | #define HEADER_COMP_LOCAL_H | ||
5 | |||
6 | __BEGIN_HIDDEN_DECLS | ||
7 | |||
8 | __END_HIDDEN_DECLS | ||
9 | |||
10 | #endif /* !HEADER_COMP_LOCAL_H */ | ||