diff options
Diffstat (limited to 'src/lib/libcrypto/comp')
| -rw-r--r-- | src/lib/libcrypto/comp/Makefile (renamed from src/lib/libcrypto/comp/Makefile.ssl) | 56 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/c_rle.c | 61 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/c_zlib.c | 799 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp.h | 80 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp_err.c | 100 | ||||
| -rw-r--r-- | src/lib/libcrypto/comp/comp_lib.c | 72 |
6 files changed, 1137 insertions, 31 deletions
diff --git a/src/lib/libcrypto/comp/Makefile.ssl b/src/lib/libcrypto/comp/Makefile index f70ba1b285..efda832dce 100644 --- a/src/lib/libcrypto/comp/Makefile.ssl +++ b/src/lib/libcrypto/comp/Makefile | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # | 1 | # |
| 2 | # SSLeay/crypto/comp/Makefile | 2 | # OpenSSL/crypto/comp/Makefile |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | DIR= comp | 5 | DIR= comp |
| @@ -7,13 +7,7 @@ TOP= ../.. | |||
| 7 | CC= cc | 7 | CC= cc |
| 8 | INCLUDES= -I.. -I$(TOP) -I../../include | 8 | INCLUDES= -I.. -I$(TOP) -I../../include |
| 9 | CFLAG=-g | 9 | CFLAG=-g |
| 10 | INSTALL_PREFIX= | 10 | MAKEFILE= Makefile |
| 11 | OPENSSLDIR= /usr/local/ssl | ||
| 12 | INSTALLTOP=/usr/local/ssl | ||
| 13 | MAKE= make -f Makefile.ssl | ||
| 14 | MAKEDEPPROG= makedepend | ||
| 15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
| 16 | MAKEFILE= Makefile.ssl | ||
| 17 | AR= ar r | 11 | AR= ar r |
| 18 | 12 | ||
| 19 | CFLAGS= $(INCLUDES) $(CFLAG) | 13 | CFLAGS= $(INCLUDES) $(CFLAG) |
| @@ -47,16 +41,16 @@ lib: $(LIBOBJ) | |||
| 47 | @touch lib | 41 | @touch lib |
| 48 | 42 | ||
| 49 | files: | 43 | files: |
| 50 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | 44 | $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO |
| 51 | 45 | ||
| 52 | links: | 46 | links: |
| 53 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
| 54 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | 47 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) |
| 55 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | 48 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) |
| 56 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | 49 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) |
| 57 | 50 | ||
| 58 | install: | 51 | install: |
| 59 | @for i in $(EXHEADER) ; \ | 52 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
| 53 | @headerlist="$(EXHEADER)"; for i in $$headerlist ; \ | ||
| 60 | do \ | 54 | do \ |
| 61 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | 55 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ |
| 62 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | 56 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ |
| @@ -71,6 +65,7 @@ lint: | |||
| 71 | lint -DLINT $(INCLUDES) $(SRC)>fluff | 65 | lint -DLINT $(INCLUDES) $(SRC)>fluff |
| 72 | 66 | ||
| 73 | depend: | 67 | depend: |
| 68 | @[ -n "$(MAKEDEPEND)" ] # should be set by upper Makefile... | ||
| 74 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) | 69 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(LIBSRC) |
| 75 | 70 | ||
| 76 | dclean: | 71 | dclean: |
| @@ -83,32 +78,31 @@ clean: | |||
| 83 | # DO NOT DELETE THIS LINE -- make depend depends on it. | 78 | # DO NOT DELETE THIS LINE -- make depend depends on it. |
| 84 | 79 | ||
| 85 | c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 80 | c_rle.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 86 | c_rle.o: ../../include/openssl/bn.h ../../include/openssl/comp.h | 81 | c_rle.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h |
| 87 | c_rle.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 82 | c_rle.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h |
| 88 | c_rle.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 83 | c_rle.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 89 | c_rle.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 84 | c_rle.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 90 | c_rle.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | 85 | c_rle.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 91 | c_rle.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h c_rle.c | 86 | c_rle.o: ../../include/openssl/symhacks.h c_rle.c |
| 92 | c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 87 | c_zlib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 93 | c_zlib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h | 88 | c_zlib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h |
| 94 | c_zlib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 89 | c_zlib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
| 95 | c_zlib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 90 | c_zlib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 96 | c_zlib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 91 | c_zlib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 97 | c_zlib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | 92 | c_zlib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 98 | c_zlib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 93 | c_zlib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 99 | c_zlib.o: c_zlib.c | 94 | c_zlib.o: ../../include/openssl/symhacks.h c_zlib.c |
| 100 | comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h | 95 | comp_err.o: ../../include/openssl/bio.h ../../include/openssl/comp.h |
| 101 | comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 96 | comp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 102 | comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | 97 | comp_err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h |
| 103 | comp_err.o: ../../include/openssl/opensslconf.h | 98 | comp_err.o: ../../include/openssl/opensslconf.h |
| 104 | comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h | 99 | comp_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 105 | comp_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 100 | comp_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 106 | comp_err.o: comp_err.c | 101 | comp_err.o: ../../include/openssl/symhacks.h comp_err.c |
| 107 | comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | 102 | comp_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h |
| 108 | comp_lib.o: ../../include/openssl/bn.h ../../include/openssl/comp.h | 103 | comp_lib.o: ../../include/openssl/comp.h ../../include/openssl/crypto.h |
| 109 | comp_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 104 | comp_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/obj_mac.h |
| 110 | comp_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 105 | comp_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 111 | comp_lib.o: ../../include/openssl/opensslconf.h | ||
| 112 | comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 106 | comp_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 113 | comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 107 | comp_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 114 | comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c | 108 | comp_lib.o: ../../include/openssl/symhacks.h comp_lib.c |
diff --git a/src/lib/libcrypto/comp/c_rle.c b/src/lib/libcrypto/comp/c_rle.c new file mode 100644 index 0000000000..47dfb67fbd --- /dev/null +++ b/src/lib/libcrypto/comp/c_rle.c | |||
| @@ -0,0 +1,61 @@ | |||
| 1 | #include <stdio.h> | ||
| 2 | #include <stdlib.h> | ||
| 3 | #include <string.h> | ||
| 4 | #include <openssl/objects.h> | ||
| 5 | #include <openssl/comp.h> | ||
| 6 | |||
| 7 | static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, | ||
| 8 | unsigned int olen, unsigned char *in, unsigned int ilen); | ||
| 9 | static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, | ||
| 10 | unsigned int olen, unsigned char *in, unsigned int ilen); | ||
| 11 | |||
| 12 | static COMP_METHOD rle_method={ | ||
| 13 | NID_rle_compression, | ||
| 14 | LN_rle_compression, | ||
| 15 | NULL, | ||
| 16 | NULL, | ||
| 17 | rle_compress_block, | ||
| 18 | rle_expand_block, | ||
| 19 | NULL, | ||
| 20 | NULL, | ||
| 21 | }; | ||
| 22 | |||
| 23 | COMP_METHOD *COMP_rle(void) | ||
| 24 | { | ||
| 25 | return(&rle_method); | ||
| 26 | } | ||
| 27 | |||
| 28 | static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, | ||
| 29 | unsigned int olen, unsigned char *in, unsigned int ilen) | ||
| 30 | { | ||
| 31 | /* int i; */ | ||
| 32 | |||
| 33 | if (ilen == 0 || olen < (ilen-1)) | ||
| 34 | { | ||
| 35 | /* ZZZZZZZZZZZZZZZZZZZZZZ */ | ||
| 36 | return(-1); | ||
| 37 | } | ||
| 38 | |||
| 39 | *(out++)=0; | ||
| 40 | memcpy(out,in,ilen); | ||
| 41 | return(ilen+1); | ||
| 42 | } | ||
| 43 | |||
| 44 | static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, | ||
| 45 | unsigned int olen, unsigned char *in, unsigned int ilen) | ||
| 46 | { | ||
| 47 | int i; | ||
| 48 | |||
| 49 | if (olen < (ilen-1)) | ||
| 50 | { | ||
| 51 | /* ZZZZZZZZZZZZZZZZZZZZZZ */ | ||
| 52 | return(-1); | ||
| 53 | } | ||
| 54 | |||
| 55 | i= *(in++); | ||
| 56 | if (i == 0) | ||
| 57 | { | ||
| 58 | memcpy(out,in,ilen-1); | ||
| 59 | } | ||
| 60 | return(ilen-1); | ||
| 61 | } | ||
diff --git a/src/lib/libcrypto/comp/c_zlib.c b/src/lib/libcrypto/comp/c_zlib.c new file mode 100644 index 0000000000..8adf35f3fc --- /dev/null +++ b/src/lib/libcrypto/comp/c_zlib.c | |||
| @@ -0,0 +1,799 @@ | |||
| 1 | #include <stdio.h> | ||
| 2 | #include <stdlib.h> | ||
| 3 | #include <string.h> | ||
| 4 | #include <openssl/objects.h> | ||
| 5 | #include <openssl/comp.h> | ||
| 6 | #include <openssl/err.h> | ||
| 7 | |||
| 8 | COMP_METHOD *COMP_zlib(void ); | ||
| 9 | |||
| 10 | static COMP_METHOD zlib_method_nozlib={ | ||
| 11 | NID_undef, | ||
| 12 | "(undef)", | ||
| 13 | NULL, | ||
| 14 | NULL, | ||
| 15 | NULL, | ||
| 16 | NULL, | ||
| 17 | NULL, | ||
| 18 | NULL, | ||
| 19 | }; | ||
| 20 | |||
| 21 | #ifndef ZLIB | ||
| 22 | #undef ZLIB_SHARED | ||
| 23 | #else | ||
| 24 | |||
| 25 | #include <zlib.h> | ||
| 26 | |||
| 27 | static int zlib_stateful_init(COMP_CTX *ctx); | ||
| 28 | static void zlib_stateful_finish(COMP_CTX *ctx); | ||
| 29 | static int zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out, | ||
| 30 | unsigned int olen, unsigned char *in, unsigned int ilen); | ||
| 31 | static int zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out, | ||
| 32 | unsigned int olen, unsigned char *in, unsigned int ilen); | ||
| 33 | |||
| 34 | |||
| 35 | /* memory allocations functions for zlib intialization */ | ||
| 36 | static void* zlib_zalloc(void* opaque, unsigned int no, unsigned int size) | ||
| 37 | { | ||
| 38 | void *p; | ||
| 39 | |||
| 40 | p=OPENSSL_malloc(no*size); | ||
| 41 | if (p) | ||
| 42 | memset(p, 0, no*size); | ||
| 43 | return p; | ||
| 44 | } | ||
| 45 | |||
| 46 | |||
| 47 | static void zlib_zfree(void* opaque, void* address) | ||
| 48 | { | ||
| 49 | OPENSSL_free(address); | ||
| 50 | } | ||
| 51 | |||
| 52 | #if 0 | ||
| 53 | static int zlib_compress_block(COMP_CTX *ctx, unsigned char *out, | ||
| 54 | unsigned int olen, unsigned char *in, unsigned int ilen); | ||
| 55 | static int zlib_expand_block(COMP_CTX *ctx, unsigned char *out, | ||
| 56 | unsigned int olen, unsigned char *in, unsigned int ilen); | ||
| 57 | |||
| 58 | static int zz_uncompress(Bytef *dest, uLongf *destLen, const Bytef *source, | ||
| 59 | uLong sourceLen); | ||
| 60 | |||
| 61 | static COMP_METHOD zlib_stateless_method={ | ||
| 62 | NID_zlib_compression, | ||
| 63 | LN_zlib_compression, | ||
| 64 | NULL, | ||
| 65 | NULL, | ||
| 66 | zlib_compress_block, | ||
| 67 | zlib_expand_block, | ||
| 68 | NULL, | ||
| 69 | NULL, | ||
| 70 | }; | ||
| 71 | #endif | ||
| 72 | |||
| 73 | static COMP_METHOD zlib_stateful_method={ | ||
| 74 | NID_zlib_compression, | ||
| 75 | LN_zlib_compression, | ||
| 76 | zlib_stateful_init, | ||
| 77 | zlib_stateful_finish, | ||
| 78 | zlib_stateful_compress_block, | ||
| 79 | zlib_stateful_expand_block, | ||
| 80 | NULL, | ||
| 81 | NULL, | ||
| 82 | }; | ||
| 83 | |||
| 84 | /* | ||
| 85 | * When OpenSSL is built on Windows, we do not want to require that | ||
| 86 | * the ZLIB.DLL be available in order for the OpenSSL DLLs to | ||
| 87 | * work. Therefore, all ZLIB routines are loaded at run time | ||
| 88 | * and we do not link to a .LIB file when ZLIB_SHARED is set. | ||
| 89 | */ | ||
| 90 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) | ||
| 91 | # include <windows.h> | ||
| 92 | #endif /* !(OPENSSL_SYS_WINDOWS || OPENSSL_SYS_WIN32) */ | ||
| 93 | |||
| 94 | #ifdef ZLIB_SHARED | ||
| 95 | #include <openssl/dso.h> | ||
| 96 | |||
| 97 | /* Function pointers */ | ||
| 98 | typedef int (*compress_ft)(Bytef *dest,uLongf *destLen, | ||
| 99 | const Bytef *source, uLong sourceLen); | ||
| 100 | typedef int (*inflateEnd_ft)(z_streamp strm); | ||
| 101 | typedef int (*inflate_ft)(z_streamp strm, int flush); | ||
| 102 | typedef int (*inflateInit__ft)(z_streamp strm, | ||
| 103 | const char * version, int stream_size); | ||
| 104 | typedef int (*deflateEnd_ft)(z_streamp strm); | ||
| 105 | typedef int (*deflate_ft)(z_streamp strm, int flush); | ||
| 106 | typedef int (*deflateInit__ft)(z_streamp strm, int level, | ||
| 107 | const char * version, int stream_size); | ||
| 108 | typedef const char * (*zError__ft)(int err); | ||
| 109 | static compress_ft p_compress=NULL; | ||
| 110 | static inflateEnd_ft p_inflateEnd=NULL; | ||
| 111 | static inflate_ft p_inflate=NULL; | ||
| 112 | static inflateInit__ft p_inflateInit_=NULL; | ||
| 113 | static deflateEnd_ft p_deflateEnd=NULL; | ||
| 114 | static deflate_ft p_deflate=NULL; | ||
| 115 | static deflateInit__ft p_deflateInit_=NULL; | ||
| 116 | static zError__ft p_zError=NULL; | ||
| 117 | |||
| 118 | static int zlib_loaded = 0; /* only attempt to init func pts once */ | ||
| 119 | static DSO *zlib_dso = NULL; | ||
| 120 | |||
| 121 | #define compress p_compress | ||
| 122 | #define inflateEnd p_inflateEnd | ||
| 123 | #define inflate p_inflate | ||
| 124 | #define inflateInit_ p_inflateInit_ | ||
| 125 | #define deflateEnd p_deflateEnd | ||
| 126 | #define deflate p_deflate | ||
| 127 | #define deflateInit_ p_deflateInit_ | ||
| 128 | #define zError p_zError | ||
| 129 | #endif /* ZLIB_SHARED */ | ||
| 130 | |||
| 131 | struct zlib_state | ||
| 132 | { | ||
| 133 | z_stream istream; | ||
| 134 | z_stream ostream; | ||
| 135 | }; | ||
| 136 | |||
| 137 | static int zlib_stateful_ex_idx = -1; | ||
| 138 | |||
| 139 | static int zlib_stateful_init(COMP_CTX *ctx) | ||
| 140 | { | ||
| 141 | int err; | ||
| 142 | struct zlib_state *state = | ||
| 143 | (struct zlib_state *)OPENSSL_malloc(sizeof(struct zlib_state)); | ||
| 144 | |||
| 145 | if (state == NULL) | ||
| 146 | goto err; | ||
| 147 | |||
| 148 | state->istream.zalloc = zlib_zalloc; | ||
| 149 | state->istream.zfree = zlib_zfree; | ||
| 150 | state->istream.opaque = Z_NULL; | ||
| 151 | state->istream.next_in = Z_NULL; | ||
| 152 | state->istream.next_out = Z_NULL; | ||
| 153 | state->istream.avail_in = 0; | ||
| 154 | state->istream.avail_out = 0; | ||
| 155 | err = inflateInit_(&state->istream, | ||
| 156 | ZLIB_VERSION, sizeof(z_stream)); | ||
| 157 | if (err != Z_OK) | ||
| 158 | goto err; | ||
| 159 | |||
| 160 | state->ostream.zalloc = zlib_zalloc; | ||
| 161 | state->ostream.zfree = zlib_zfree; | ||
| 162 | state->ostream.opaque = Z_NULL; | ||
| 163 | state->ostream.next_in = Z_NULL; | ||
| 164 | state->ostream.next_out = Z_NULL; | ||
| 165 | state->ostream.avail_in = 0; | ||
| 166 | state->ostream.avail_out = 0; | ||
| 167 | err = deflateInit_(&state->ostream,Z_DEFAULT_COMPRESSION, | ||
| 168 | ZLIB_VERSION, sizeof(z_stream)); | ||
| 169 | if (err != Z_OK) | ||
| 170 | goto err; | ||
| 171 | |||
| 172 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data); | ||
| 173 | CRYPTO_set_ex_data(&ctx->ex_data,zlib_stateful_ex_idx,state); | ||
| 174 | return 1; | ||
| 175 | err: | ||
| 176 | if (state) OPENSSL_free(state); | ||
| 177 | return 0; | ||
| 178 | } | ||
| 179 | |||
| 180 | static void zlib_stateful_finish(COMP_CTX *ctx) | ||
| 181 | { | ||
| 182 | struct zlib_state *state = | ||
| 183 | (struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data, | ||
| 184 | zlib_stateful_ex_idx); | ||
| 185 | inflateEnd(&state->istream); | ||
| 186 | deflateEnd(&state->ostream); | ||
| 187 | OPENSSL_free(state); | ||
| 188 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data); | ||
| 189 | } | ||
| 190 | |||
| 191 | static int zlib_stateful_compress_block(COMP_CTX *ctx, unsigned char *out, | ||
| 192 | unsigned int olen, unsigned char *in, unsigned int ilen) | ||
| 193 | { | ||
| 194 | int err = Z_OK; | ||
| 195 | struct zlib_state *state = | ||
| 196 | (struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data, | ||
| 197 | zlib_stateful_ex_idx); | ||
| 198 | |||
| 199 | if (state == NULL) | ||
| 200 | return -1; | ||
| 201 | |||
| 202 | state->ostream.next_in = in; | ||
| 203 | state->ostream.avail_in = ilen; | ||
| 204 | state->ostream.next_out = out; | ||
| 205 | state->ostream.avail_out = olen; | ||
| 206 | if (ilen > 0) | ||
| 207 | err = deflate(&state->ostream, Z_SYNC_FLUSH); | ||
| 208 | if (err != Z_OK) | ||
| 209 | return -1; | ||
| 210 | #ifdef DEBUG_ZLIB | ||
| 211 | fprintf(stderr,"compress(%4d)->%4d %s\n", | ||
| 212 | ilen,olen - state->ostream.avail_out, | ||
| 213 | (ilen != olen - state->ostream.avail_out)?"zlib":"clear"); | ||
| 214 | #endif | ||
| 215 | return olen - state->ostream.avail_out; | ||
| 216 | } | ||
| 217 | |||
| 218 | static int zlib_stateful_expand_block(COMP_CTX *ctx, unsigned char *out, | ||
| 219 | unsigned int olen, unsigned char *in, unsigned int ilen) | ||
| 220 | { | ||
| 221 | int err = Z_OK; | ||
| 222 | |||
| 223 | struct zlib_state *state = | ||
| 224 | (struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data, | ||
| 225 | zlib_stateful_ex_idx); | ||
| 226 | |||
| 227 | if (state == NULL) | ||
| 228 | return 0; | ||
| 229 | |||
| 230 | state->istream.next_in = in; | ||
| 231 | state->istream.avail_in = ilen; | ||
| 232 | state->istream.next_out = out; | ||
| 233 | state->istream.avail_out = olen; | ||
| 234 | if (ilen > 0) | ||
| 235 | err = inflate(&state->istream, Z_SYNC_FLUSH); | ||
| 236 | if (err != Z_OK) | ||
| 237 | return -1; | ||
| 238 | #ifdef DEBUG_ZLIB | ||
| 239 | fprintf(stderr,"expand(%4d)->%4d %s\n", | ||
| 240 | ilen,olen - state->istream.avail_out, | ||
| 241 | (ilen != olen - state->istream.avail_out)?"zlib":"clear"); | ||
| 242 | #endif | ||
| 243 | return olen - state->istream.avail_out; | ||
| 244 | } | ||
| 245 | |||
| 246 | #if 0 | ||
| 247 | static int zlib_compress_block(COMP_CTX *ctx, unsigned char *out, | ||
| 248 | unsigned int olen, unsigned char *in, unsigned int ilen) | ||
| 249 | { | ||
| 250 | unsigned long l; | ||
| 251 | int i; | ||
| 252 | int clear=1; | ||
| 253 | |||
| 254 | if (ilen > 128) | ||
| 255 | { | ||
| 256 | out[0]=1; | ||
| 257 | l=olen-1; | ||
| 258 | i=compress(&(out[1]),&l,in,(unsigned long)ilen); | ||
| 259 | if (i != Z_OK) | ||
| 260 | return(-1); | ||
| 261 | if (ilen > l) | ||
| 262 | { | ||
| 263 | clear=0; | ||
| 264 | l++; | ||
| 265 | } | ||
| 266 | } | ||
| 267 | if (clear) | ||
| 268 | { | ||
| 269 | out[0]=0; | ||
| 270 | memcpy(&(out[1]),in,ilen); | ||
| 271 | l=ilen+1; | ||
| 272 | } | ||
| 273 | #ifdef DEBUG_ZLIB | ||
| 274 | fprintf(stderr,"compress(%4d)->%4d %s\n", | ||
| 275 | ilen,(int)l,(clear)?"clear":"zlib"); | ||
| 276 | #endif | ||
| 277 | return((int)l); | ||
| 278 | } | ||
| 279 | |||
| 280 | static int zlib_expand_block(COMP_CTX *ctx, unsigned char *out, | ||
| 281 | unsigned int olen, unsigned char *in, unsigned int ilen) | ||
| 282 | { | ||
| 283 | unsigned long l; | ||
| 284 | int i; | ||
| 285 | |||
| 286 | if (in[0]) | ||
| 287 | { | ||
| 288 | l=olen; | ||
| 289 | i=zz_uncompress(out,&l,&(in[1]),(unsigned long)ilen-1); | ||
| 290 | if (i != Z_OK) | ||
| 291 | return(-1); | ||
| 292 | } | ||
| 293 | else | ||
| 294 | { | ||
| 295 | memcpy(out,&(in[1]),ilen-1); | ||
| 296 | l=ilen-1; | ||
| 297 | } | ||
| 298 | #ifdef DEBUG_ZLIB | ||
| 299 | fprintf(stderr,"expand (%4d)->%4d %s\n", | ||
| 300 | ilen,(int)l,in[0]?"zlib":"clear"); | ||
| 301 | #endif | ||
| 302 | return((int)l); | ||
| 303 | } | ||
| 304 | |||
| 305 | static int zz_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, | ||
| 306 | uLong sourceLen) | ||
| 307 | { | ||
| 308 | z_stream stream; | ||
| 309 | int err; | ||
| 310 | |||
| 311 | stream.next_in = (Bytef*)source; | ||
| 312 | stream.avail_in = (uInt)sourceLen; | ||
| 313 | /* Check for source > 64K on 16-bit machine: */ | ||
| 314 | if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; | ||
| 315 | |||
| 316 | stream.next_out = dest; | ||
| 317 | stream.avail_out = (uInt)*destLen; | ||
| 318 | if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; | ||
| 319 | |||
| 320 | stream.zalloc = (alloc_func)0; | ||
| 321 | stream.zfree = (free_func)0; | ||
| 322 | |||
| 323 | err = inflateInit_(&stream, | ||
| 324 | ZLIB_VERSION, sizeof(z_stream)); | ||
| 325 | if (err != Z_OK) return err; | ||
| 326 | |||
| 327 | err = inflate(&stream, Z_FINISH); | ||
| 328 | if (err != Z_STREAM_END) { | ||
| 329 | inflateEnd(&stream); | ||
| 330 | return err; | ||
| 331 | } | ||
| 332 | *destLen = stream.total_out; | ||
| 333 | |||
| 334 | err = inflateEnd(&stream); | ||
| 335 | return err; | ||
| 336 | } | ||
| 337 | #endif | ||
| 338 | |||
| 339 | #endif | ||
| 340 | |||
| 341 | COMP_METHOD *COMP_zlib(void) | ||
| 342 | { | ||
| 343 | COMP_METHOD *meth = &zlib_method_nozlib; | ||
| 344 | |||
| 345 | #ifdef ZLIB_SHARED | ||
| 346 | if (!zlib_loaded) | ||
| 347 | { | ||
| 348 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) | ||
| 349 | zlib_dso = DSO_load(NULL, "ZLIB1", NULL, 0); | ||
| 350 | #else | ||
| 351 | zlib_dso = DSO_load(NULL, "z", NULL, 0); | ||
| 352 | #endif | ||
| 353 | if (zlib_dso != NULL) | ||
| 354 | { | ||
| 355 | p_compress | ||
| 356 | = (compress_ft) DSO_bind_func(zlib_dso, | ||
| 357 | "compress"); | ||
| 358 | p_inflateEnd | ||
| 359 | = (inflateEnd_ft) DSO_bind_func(zlib_dso, | ||
| 360 | "inflateEnd"); | ||
| 361 | p_inflate | ||
| 362 | = (inflate_ft) DSO_bind_func(zlib_dso, | ||
| 363 | "inflate"); | ||
| 364 | p_inflateInit_ | ||
| 365 | = (inflateInit__ft) DSO_bind_func(zlib_dso, | ||
| 366 | "inflateInit_"); | ||
| 367 | p_deflateEnd | ||
| 368 | = (deflateEnd_ft) DSO_bind_func(zlib_dso, | ||
| 369 | "deflateEnd"); | ||
| 370 | p_deflate | ||
| 371 | = (deflate_ft) DSO_bind_func(zlib_dso, | ||
| 372 | "deflate"); | ||
| 373 | p_deflateInit_ | ||
| 374 | = (deflateInit__ft) DSO_bind_func(zlib_dso, | ||
| 375 | "deflateInit_"); | ||
| 376 | p_zError | ||
| 377 | = (zError__ft) DSO_bind_func(zlib_dso, | ||
| 378 | "zError"); | ||
| 379 | |||
| 380 | if (p_compress && p_inflateEnd && p_inflate | ||
| 381 | && p_inflateInit_ && p_deflateEnd | ||
| 382 | && p_deflate && p_deflateInit_ && p_zError) | ||
| 383 | zlib_loaded++; | ||
| 384 | } | ||
| 385 | } | ||
| 386 | |||
| 387 | #endif | ||
| 388 | #ifdef ZLIB_SHARED | ||
| 389 | if (zlib_loaded) | ||
| 390 | #endif | ||
| 391 | #if defined(ZLIB) || defined(ZLIB_SHARED) | ||
| 392 | { | ||
| 393 | /* init zlib_stateful_ex_idx here so that in a multi-process | ||
| 394 | * application it's enough to intialize openssl before forking | ||
| 395 | * (idx will be inherited in all the children) */ | ||
| 396 | if (zlib_stateful_ex_idx == -1) | ||
| 397 | { | ||
| 398 | CRYPTO_w_lock(CRYPTO_LOCK_COMP); | ||
| 399 | if (zlib_stateful_ex_idx == -1) | ||
| 400 | zlib_stateful_ex_idx = | ||
| 401 | CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP, | ||
| 402 | 0,NULL,NULL,NULL,NULL); | ||
| 403 | CRYPTO_w_unlock(CRYPTO_LOCK_COMP); | ||
| 404 | if (zlib_stateful_ex_idx == -1) | ||
| 405 | goto err; | ||
| 406 | } | ||
| 407 | |||
| 408 | meth = &zlib_stateful_method; | ||
| 409 | } | ||
| 410 | err: | ||
| 411 | #endif | ||
| 412 | |||
| 413 | return(meth); | ||
| 414 | } | ||
| 415 | |||
| 416 | void COMP_zlib_cleanup(void) | ||
| 417 | { | ||
| 418 | #ifdef ZLIB_SHARED | ||
| 419 | if (zlib_dso) | ||
| 420 | DSO_free(zlib_dso); | ||
| 421 | #endif | ||
| 422 | } | ||
| 423 | |||
| 424 | #ifdef ZLIB | ||
| 425 | |||
| 426 | /* Zlib based compression/decompression filter BIO */ | ||
| 427 | |||
| 428 | typedef struct | ||
| 429 | { | ||
| 430 | unsigned char *ibuf; /* Input buffer */ | ||
| 431 | int ibufsize; /* Buffer size */ | ||
| 432 | z_stream zin; /* Input decompress context */ | ||
| 433 | unsigned char *obuf; /* Output buffer */ | ||
| 434 | int obufsize; /* Output buffer size */ | ||
| 435 | unsigned char *optr; /* Position in output buffer */ | ||
| 436 | int ocount; /* Amount of data in output buffer */ | ||
| 437 | int odone; /* deflate EOF */ | ||
| 438 | int comp_level; /* Compression level to use */ | ||
| 439 | z_stream zout; /* Output compression context */ | ||
| 440 | } BIO_ZLIB_CTX; | ||
| 441 | |||
| 442 | #define ZLIB_DEFAULT_BUFSIZE 1024 | ||
| 443 | |||
| 444 | static int bio_zlib_new(BIO *bi); | ||
| 445 | static int bio_zlib_free(BIO *bi); | ||
| 446 | static int bio_zlib_read(BIO *b, char *out, int outl); | ||
| 447 | static int bio_zlib_write(BIO *b, const char *in, int inl); | ||
| 448 | static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr); | ||
| 449 | static long bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp); | ||
| 450 | |||
| 451 | static BIO_METHOD bio_meth_zlib = | ||
| 452 | { | ||
| 453 | BIO_TYPE_COMP, | ||
| 454 | "zlib", | ||
| 455 | bio_zlib_write, | ||
| 456 | bio_zlib_read, | ||
| 457 | NULL, | ||
| 458 | NULL, | ||
| 459 | bio_zlib_ctrl, | ||
| 460 | bio_zlib_new, | ||
| 461 | bio_zlib_free, | ||
| 462 | bio_zlib_callback_ctrl | ||
| 463 | }; | ||
| 464 | |||
| 465 | BIO_METHOD *BIO_f_zlib(void) | ||
| 466 | { | ||
| 467 | return &bio_meth_zlib; | ||
| 468 | } | ||
| 469 | |||
| 470 | |||
| 471 | static int bio_zlib_new(BIO *bi) | ||
| 472 | { | ||
| 473 | BIO_ZLIB_CTX *ctx; | ||
| 474 | #ifdef ZLIB_SHARED | ||
| 475 | (void)COMP_zlib(); | ||
| 476 | if (!zlib_loaded) | ||
| 477 | { | ||
| 478 | COMPerr(COMP_F_BIO_ZLIB_NEW, COMP_R_ZLIB_NOT_SUPPORTED); | ||
| 479 | return 0; | ||
| 480 | } | ||
| 481 | #endif | ||
| 482 | ctx = OPENSSL_malloc(sizeof(BIO_ZLIB_CTX)); | ||
| 483 | if(!ctx) | ||
| 484 | { | ||
| 485 | COMPerr(COMP_F_BIO_ZLIB_NEW, ERR_R_MALLOC_FAILURE); | ||
| 486 | return 0; | ||
| 487 | } | ||
| 488 | ctx->ibuf = NULL; | ||
| 489 | ctx->obuf = NULL; | ||
| 490 | ctx->ibufsize = ZLIB_DEFAULT_BUFSIZE; | ||
| 491 | ctx->obufsize = ZLIB_DEFAULT_BUFSIZE; | ||
| 492 | ctx->zin.zalloc = Z_NULL; | ||
| 493 | ctx->zin.zfree = Z_NULL; | ||
| 494 | ctx->zin.next_in = NULL; | ||
| 495 | ctx->zin.avail_in = 0; | ||
| 496 | ctx->zin.next_out = NULL; | ||
| 497 | ctx->zin.avail_out = 0; | ||
| 498 | ctx->zout.zalloc = Z_NULL; | ||
| 499 | ctx->zout.zfree = Z_NULL; | ||
| 500 | ctx->zout.next_in = NULL; | ||
| 501 | ctx->zout.avail_in = 0; | ||
| 502 | ctx->zout.next_out = NULL; | ||
| 503 | ctx->zout.avail_out = 0; | ||
| 504 | ctx->odone = 0; | ||
| 505 | ctx->comp_level = Z_DEFAULT_COMPRESSION; | ||
| 506 | bi->init = 1; | ||
| 507 | bi->ptr = (char *)ctx; | ||
| 508 | bi->flags = 0; | ||
| 509 | return 1; | ||
| 510 | } | ||
| 511 | |||
| 512 | static int bio_zlib_free(BIO *bi) | ||
| 513 | { | ||
| 514 | BIO_ZLIB_CTX *ctx; | ||
| 515 | if(!bi) return 0; | ||
| 516 | ctx = (BIO_ZLIB_CTX *)bi->ptr; | ||
| 517 | if(ctx->ibuf) | ||
| 518 | { | ||
| 519 | /* Destroy decompress context */ | ||
| 520 | inflateEnd(&ctx->zin); | ||
| 521 | OPENSSL_free(ctx->ibuf); | ||
| 522 | } | ||
| 523 | if(ctx->obuf) | ||
| 524 | { | ||
| 525 | /* Destroy compress context */ | ||
| 526 | deflateEnd(&ctx->zout); | ||
| 527 | OPENSSL_free(ctx->obuf); | ||
| 528 | } | ||
| 529 | OPENSSL_free(ctx); | ||
| 530 | bi->ptr = NULL; | ||
| 531 | bi->init = 0; | ||
| 532 | bi->flags = 0; | ||
| 533 | return 1; | ||
| 534 | } | ||
| 535 | |||
| 536 | static int bio_zlib_read(BIO *b, char *out, int outl) | ||
| 537 | { | ||
| 538 | BIO_ZLIB_CTX *ctx; | ||
| 539 | int ret; | ||
| 540 | z_stream *zin; | ||
| 541 | if(!out || !outl) return 0; | ||
| 542 | ctx = (BIO_ZLIB_CTX *)b->ptr; | ||
| 543 | zin = &ctx->zin; | ||
| 544 | BIO_clear_retry_flags(b); | ||
| 545 | if(!ctx->ibuf) | ||
| 546 | { | ||
| 547 | ctx->ibuf = OPENSSL_malloc(ctx->ibufsize); | ||
| 548 | if(!ctx->ibuf) | ||
| 549 | { | ||
| 550 | COMPerr(COMP_F_BIO_ZLIB_READ, ERR_R_MALLOC_FAILURE); | ||
| 551 | return 0; | ||
| 552 | } | ||
| 553 | inflateInit(zin); | ||
| 554 | zin->next_in = ctx->ibuf; | ||
| 555 | zin->avail_in = 0; | ||
| 556 | } | ||
| 557 | |||
| 558 | /* Copy output data directly to supplied buffer */ | ||
| 559 | zin->next_out = (unsigned char *)out; | ||
| 560 | zin->avail_out = (unsigned int)outl; | ||
| 561 | for(;;) | ||
| 562 | { | ||
| 563 | /* Decompress while data available */ | ||
| 564 | while(zin->avail_in) | ||
| 565 | { | ||
| 566 | ret = inflate(zin, 0); | ||
| 567 | if((ret != Z_OK) && (ret != Z_STREAM_END)) | ||
| 568 | { | ||
| 569 | COMPerr(COMP_F_BIO_ZLIB_READ, | ||
| 570 | COMP_R_ZLIB_INFLATE_ERROR); | ||
| 571 | ERR_add_error_data(2, "zlib error:", | ||
| 572 | zError(ret)); | ||
| 573 | return 0; | ||
| 574 | } | ||
| 575 | /* If EOF or we've read everything then return */ | ||
| 576 | if((ret == Z_STREAM_END) || !zin->avail_out) | ||
| 577 | return outl - zin->avail_out; | ||
| 578 | } | ||
| 579 | |||
| 580 | /* No data in input buffer try to read some in, | ||
| 581 | * if an error then return the total data read. | ||
| 582 | */ | ||
| 583 | ret = BIO_read(b->next_bio, ctx->ibuf, ctx->ibufsize); | ||
| 584 | if(ret <= 0) | ||
| 585 | { | ||
| 586 | /* Total data read */ | ||
| 587 | int tot = outl - zin->avail_out; | ||
| 588 | BIO_copy_next_retry(b); | ||
| 589 | if(ret < 0) return (tot > 0) ? tot : ret; | ||
| 590 | return tot; | ||
| 591 | } | ||
| 592 | zin->avail_in = ret; | ||
| 593 | zin->next_in = ctx->ibuf; | ||
| 594 | } | ||
| 595 | } | ||
| 596 | |||
| 597 | static int bio_zlib_write(BIO *b, const char *in, int inl) | ||
| 598 | { | ||
| 599 | BIO_ZLIB_CTX *ctx; | ||
| 600 | int ret; | ||
| 601 | z_stream *zout; | ||
| 602 | if(!in || !inl) return 0; | ||
| 603 | ctx = (BIO_ZLIB_CTX *)b->ptr; | ||
| 604 | if(ctx->odone) return 0; | ||
| 605 | zout = &ctx->zout; | ||
| 606 | BIO_clear_retry_flags(b); | ||
| 607 | if(!ctx->obuf) | ||
| 608 | { | ||
| 609 | ctx->obuf = OPENSSL_malloc(ctx->obufsize); | ||
| 610 | /* Need error here */ | ||
| 611 | if(!ctx->obuf) | ||
| 612 | { | ||
| 613 | COMPerr(COMP_F_BIO_ZLIB_WRITE, ERR_R_MALLOC_FAILURE); | ||
| 614 | return 0; | ||
| 615 | } | ||
| 616 | ctx->optr = ctx->obuf; | ||
| 617 | ctx->ocount = 0; | ||
| 618 | deflateInit(zout, ctx->comp_level); | ||
| 619 | zout->next_out = ctx->obuf; | ||
| 620 | zout->avail_out = ctx->obufsize; | ||
| 621 | } | ||
| 622 | /* Obtain input data directly from supplied buffer */ | ||
| 623 | zout->next_in = (void *)in; | ||
| 624 | zout->avail_in = inl; | ||
| 625 | for(;;) | ||
| 626 | { | ||
| 627 | /* If data in output buffer write it first */ | ||
| 628 | while(ctx->ocount) { | ||
| 629 | ret = BIO_write(b->next_bio, ctx->optr, ctx->ocount); | ||
| 630 | if(ret <= 0) | ||
| 631 | { | ||
| 632 | /* Total data written */ | ||
| 633 | int tot = inl - zout->avail_in; | ||
| 634 | BIO_copy_next_retry(b); | ||
| 635 | if(ret < 0) return (tot > 0) ? tot : ret; | ||
| 636 | return tot; | ||
| 637 | } | ||
| 638 | ctx->optr += ret; | ||
| 639 | ctx->ocount -= ret; | ||
| 640 | } | ||
| 641 | |||
| 642 | /* Have we consumed all supplied data? */ | ||
| 643 | if(!zout->avail_in) | ||
| 644 | return inl; | ||
| 645 | |||
| 646 | /* Compress some more */ | ||
| 647 | |||
| 648 | /* Reset buffer */ | ||
| 649 | ctx->optr = ctx->obuf; | ||
| 650 | zout->next_out = ctx->obuf; | ||
| 651 | zout->avail_out = ctx->obufsize; | ||
| 652 | /* Compress some more */ | ||
| 653 | ret = deflate(zout, 0); | ||
| 654 | if(ret != Z_OK) | ||
| 655 | { | ||
| 656 | COMPerr(COMP_F_BIO_ZLIB_WRITE, | ||
| 657 | COMP_R_ZLIB_DEFLATE_ERROR); | ||
| 658 | ERR_add_error_data(2, "zlib error:", zError(ret)); | ||
| 659 | return 0; | ||
| 660 | } | ||
| 661 | ctx->ocount = ctx->obufsize - zout->avail_out; | ||
| 662 | } | ||
| 663 | } | ||
| 664 | |||
| 665 | static int bio_zlib_flush(BIO *b) | ||
| 666 | { | ||
| 667 | BIO_ZLIB_CTX *ctx; | ||
| 668 | int ret; | ||
| 669 | z_stream *zout; | ||
| 670 | ctx = (BIO_ZLIB_CTX *)b->ptr; | ||
| 671 | /* If no data written or already flush show success */ | ||
| 672 | if(!ctx->obuf || (ctx->odone && !ctx->ocount)) return 1; | ||
| 673 | zout = &ctx->zout; | ||
| 674 | BIO_clear_retry_flags(b); | ||
| 675 | /* No more input data */ | ||
| 676 | zout->next_in = NULL; | ||
| 677 | zout->avail_in = 0; | ||
| 678 | for(;;) | ||
| 679 | { | ||
| 680 | /* If data in output buffer write it first */ | ||
| 681 | while(ctx->ocount) | ||
| 682 | { | ||
| 683 | ret = BIO_write(b->next_bio, ctx->optr, ctx->ocount); | ||
| 684 | if(ret <= 0) | ||
| 685 | { | ||
| 686 | BIO_copy_next_retry(b); | ||
| 687 | return ret; | ||
| 688 | } | ||
| 689 | ctx->optr += ret; | ||
| 690 | ctx->ocount -= ret; | ||
| 691 | } | ||
| 692 | if(ctx->odone) return 1; | ||
| 693 | |||
| 694 | /* Compress some more */ | ||
| 695 | |||
| 696 | /* Reset buffer */ | ||
| 697 | ctx->optr = ctx->obuf; | ||
| 698 | zout->next_out = ctx->obuf; | ||
| 699 | zout->avail_out = ctx->obufsize; | ||
| 700 | /* Compress some more */ | ||
| 701 | ret = deflate(zout, Z_FINISH); | ||
| 702 | if(ret == Z_STREAM_END) ctx->odone = 1; | ||
| 703 | else if(ret != Z_OK) | ||
| 704 | { | ||
| 705 | COMPerr(COMP_F_BIO_ZLIB_FLUSH, | ||
| 706 | COMP_R_ZLIB_DEFLATE_ERROR); | ||
| 707 | ERR_add_error_data(2, "zlib error:", zError(ret)); | ||
| 708 | return 0; | ||
| 709 | } | ||
| 710 | ctx->ocount = ctx->obufsize - zout->avail_out; | ||
| 711 | } | ||
| 712 | } | ||
| 713 | |||
| 714 | static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr) | ||
| 715 | { | ||
| 716 | BIO_ZLIB_CTX *ctx; | ||
| 717 | int ret, *ip; | ||
| 718 | int ibs, obs; | ||
| 719 | if(!b->next_bio) return 0; | ||
| 720 | ctx = (BIO_ZLIB_CTX *)b->ptr; | ||
| 721 | switch (cmd) | ||
| 722 | { | ||
| 723 | |||
| 724 | case BIO_CTRL_RESET: | ||
| 725 | ctx->ocount = 0; | ||
| 726 | ctx->odone = 0; | ||
| 727 | ret = 1; | ||
| 728 | break; | ||
| 729 | |||
| 730 | case BIO_CTRL_FLUSH: | ||
| 731 | ret = bio_zlib_flush(b); | ||
| 732 | if (ret > 0) | ||
| 733 | ret = BIO_flush(b->next_bio); | ||
| 734 | break; | ||
| 735 | |||
| 736 | case BIO_C_SET_BUFF_SIZE: | ||
| 737 | ibs = -1; | ||
| 738 | obs = -1; | ||
| 739 | if (ptr != NULL) | ||
| 740 | { | ||
| 741 | ip = ptr; | ||
| 742 | if (*ip == 0) | ||
| 743 | ibs = (int) num; | ||
| 744 | else | ||
| 745 | obs = (int) num; | ||
| 746 | } | ||
| 747 | else | ||
| 748 | { | ||
| 749 | ibs = (int)num; | ||
| 750 | obs = ibs; | ||
| 751 | } | ||
| 752 | |||
| 753 | if (ibs != -1) | ||
| 754 | { | ||
| 755 | if (ctx->ibuf) | ||
| 756 | { | ||
| 757 | OPENSSL_free(ctx->ibuf); | ||
| 758 | ctx->ibuf = NULL; | ||
| 759 | } | ||
| 760 | ctx->ibufsize = ibs; | ||
| 761 | } | ||
| 762 | |||
| 763 | if (obs != -1) | ||
| 764 | { | ||
| 765 | if (ctx->obuf) | ||
| 766 | { | ||
| 767 | OPENSSL_free(ctx->obuf); | ||
| 768 | ctx->obuf = NULL; | ||
| 769 | } | ||
| 770 | ctx->obufsize = obs; | ||
| 771 | } | ||
| 772 | ret = 1; | ||
| 773 | break; | ||
| 774 | |||
| 775 | case BIO_C_DO_STATE_MACHINE: | ||
| 776 | BIO_clear_retry_flags(b); | ||
| 777 | ret = BIO_ctrl(b->next_bio, cmd, num, ptr); | ||
| 778 | BIO_copy_next_retry(b); | ||
| 779 | break; | ||
| 780 | |||
| 781 | default: | ||
| 782 | ret = BIO_ctrl(b->next_bio, cmd, num, ptr); | ||
| 783 | break; | ||
| 784 | |||
| 785 | } | ||
| 786 | |||
| 787 | return ret; | ||
| 788 | } | ||
| 789 | |||
| 790 | |||
| 791 | static long bio_zlib_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) | ||
| 792 | { | ||
| 793 | if(!b->next_bio) | ||
| 794 | return 0; | ||
| 795 | return | ||
| 796 | BIO_callback_ctrl(b->next_bio, cmd, fp); | ||
| 797 | } | ||
| 798 | |||
| 799 | #endif | ||
diff --git a/src/lib/libcrypto/comp/comp.h b/src/lib/libcrypto/comp/comp.h new file mode 100644 index 0000000000..4b405c7d49 --- /dev/null +++ b/src/lib/libcrypto/comp/comp.h | |||
| @@ -0,0 +1,80 @@ | |||
| 1 | |||
| 2 | #ifndef HEADER_COMP_H | ||
| 3 | #define HEADER_COMP_H | ||
| 4 | |||
| 5 | #include <openssl/crypto.h> | ||
| 6 | |||
| 7 | #ifdef __cplusplus | ||
| 8 | extern "C" { | ||
| 9 | #endif | ||
| 10 | |||
| 11 | typedef struct comp_ctx_st COMP_CTX; | ||
| 12 | |||
| 13 | typedef struct comp_method_st | ||
| 14 | { | ||
| 15 | int type; /* NID for compression library */ | ||
| 16 | const char *name; /* A text string to identify the library */ | ||
| 17 | int (*init)(COMP_CTX *ctx); | ||
| 18 | void (*finish)(COMP_CTX *ctx); | ||
| 19 | int (*compress)(COMP_CTX *ctx, | ||
| 20 | unsigned char *out, unsigned int olen, | ||
| 21 | unsigned char *in, unsigned int ilen); | ||
| 22 | int (*expand)(COMP_CTX *ctx, | ||
| 23 | unsigned char *out, unsigned int olen, | ||
| 24 | unsigned char *in, unsigned int ilen); | ||
| 25 | /* The following two do NOTHING, but are kept for backward compatibility */ | ||
| 26 | long (*ctrl)(void); | ||
| 27 | long (*callback_ctrl)(void); | ||
| 28 | } COMP_METHOD; | ||
| 29 | |||
| 30 | struct comp_ctx_st | ||
| 31 | { | ||
| 32 | COMP_METHOD *meth; | ||
| 33 | unsigned long compress_in; | ||
| 34 | unsigned long compress_out; | ||
| 35 | unsigned long expand_in; | ||
| 36 | unsigned long expand_out; | ||
| 37 | |||
| 38 | CRYPTO_EX_DATA ex_data; | ||
| 39 | }; | ||
| 40 | |||
| 41 | |||
| 42 | COMP_CTX *COMP_CTX_new(COMP_METHOD *meth); | ||
| 43 | void COMP_CTX_free(COMP_CTX *ctx); | ||
| 44 | int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen, | ||
| 45 | unsigned char *in, int ilen); | ||
| 46 | int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, | ||
| 47 | unsigned char *in, int ilen); | ||
| 48 | COMP_METHOD *COMP_rle(void ); | ||
| 49 | COMP_METHOD *COMP_zlib(void ); | ||
| 50 | void COMP_zlib_cleanup(void); | ||
| 51 | |||
| 52 | #ifdef HEADER_BIO_H | ||
| 53 | #ifdef ZLIB | ||
| 54 | BIO_METHOD *BIO_f_zlib(void); | ||
| 55 | #endif | ||
| 56 | #endif | ||
| 57 | |||
| 58 | /* BEGIN ERROR CODES */ | ||
| 59 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 60 | * made after this point may be overwritten when the script is next run. | ||
| 61 | */ | ||
| 62 | void ERR_load_COMP_strings(void); | ||
| 63 | |||
| 64 | /* Error codes for the COMP functions. */ | ||
| 65 | |||
| 66 | /* Function codes. */ | ||
| 67 | #define COMP_F_BIO_ZLIB_FLUSH 99 | ||
| 68 | #define COMP_F_BIO_ZLIB_NEW 100 | ||
| 69 | #define COMP_F_BIO_ZLIB_READ 101 | ||
| 70 | #define COMP_F_BIO_ZLIB_WRITE 102 | ||
| 71 | |||
| 72 | /* Reason codes. */ | ||
| 73 | #define COMP_R_ZLIB_DEFLATE_ERROR 99 | ||
| 74 | #define COMP_R_ZLIB_INFLATE_ERROR 100 | ||
| 75 | #define COMP_R_ZLIB_NOT_SUPPORTED 101 | ||
| 76 | |||
| 77 | #ifdef __cplusplus | ||
| 78 | } | ||
| 79 | #endif | ||
| 80 | #endif | ||
diff --git a/src/lib/libcrypto/comp/comp_err.c b/src/lib/libcrypto/comp/comp_err.c new file mode 100644 index 0000000000..661c94c3a4 --- /dev/null +++ b/src/lib/libcrypto/comp/comp_err.c | |||
| @@ -0,0 +1,100 @@ | |||
| 1 | /* crypto/comp/comp_err.c */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 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 | |||
| 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
| 57 | * made to it will be overwritten when the script next updates this file, | ||
| 58 | * only reason strings will be preserved. | ||
| 59 | */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | #include <openssl/err.h> | ||
| 63 | #include <openssl/comp.h> | ||
| 64 | |||
| 65 | /* BEGIN ERROR CODES */ | ||
| 66 | #ifndef OPENSSL_NO_ERR | ||
| 67 | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_COMP,func,0) | ||
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_COMP,0,reason) | ||
| 70 | |||
| 71 | static ERR_STRING_DATA COMP_str_functs[]= | ||
| 72 | { | ||
| 73 | {ERR_FUNC(COMP_F_BIO_ZLIB_FLUSH), "BIO_ZLIB_FLUSH"}, | ||
| 74 | {ERR_FUNC(COMP_F_BIO_ZLIB_NEW), "BIO_ZLIB_NEW"}, | ||
| 75 | {ERR_FUNC(COMP_F_BIO_ZLIB_READ), "BIO_ZLIB_READ"}, | ||
| 76 | {ERR_FUNC(COMP_F_BIO_ZLIB_WRITE), "BIO_ZLIB_WRITE"}, | ||
| 77 | {0,NULL} | ||
| 78 | }; | ||
| 79 | |||
| 80 | static ERR_STRING_DATA COMP_str_reasons[]= | ||
| 81 | { | ||
| 82 | {ERR_REASON(COMP_R_ZLIB_DEFLATE_ERROR) ,"zlib deflate error"}, | ||
| 83 | {ERR_REASON(COMP_R_ZLIB_INFLATE_ERROR) ,"zlib inflate error"}, | ||
| 84 | {ERR_REASON(COMP_R_ZLIB_NOT_SUPPORTED) ,"zlib not supported"}, | ||
| 85 | {0,NULL} | ||
| 86 | }; | ||
| 87 | |||
| 88 | #endif | ||
| 89 | |||
| 90 | void ERR_load_COMP_strings(void) | ||
| 91 | { | ||
| 92 | #ifndef OPENSSL_NO_ERR | ||
| 93 | |||
| 94 | if (ERR_func_error_string(COMP_str_functs[0].error) == NULL) | ||
| 95 | { | ||
| 96 | ERR_load_strings(0,COMP_str_functs); | ||
| 97 | ERR_load_strings(0,COMP_str_reasons); | ||
| 98 | } | ||
| 99 | #endif | ||
| 100 | } | ||
diff --git a/src/lib/libcrypto/comp/comp_lib.c b/src/lib/libcrypto/comp/comp_lib.c new file mode 100644 index 0000000000..b60ae371e8 --- /dev/null +++ b/src/lib/libcrypto/comp/comp_lib.c | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | #include <stdio.h> | ||
| 2 | #include <stdlib.h> | ||
| 3 | #include <string.h> | ||
| 4 | #include <openssl/objects.h> | ||
| 5 | #include <openssl/comp.h> | ||
| 6 | |||
| 7 | COMP_CTX *COMP_CTX_new(COMP_METHOD *meth) | ||
| 8 | { | ||
| 9 | COMP_CTX *ret; | ||
| 10 | |||
| 11 | if ((ret=(COMP_CTX *)OPENSSL_malloc(sizeof(COMP_CTX))) == NULL) | ||
| 12 | { | ||
| 13 | /* ZZZZZZZZZZZZZZZZ */ | ||
| 14 | return(NULL); | ||
| 15 | } | ||
| 16 | memset(ret,0,sizeof(COMP_CTX)); | ||
| 17 | ret->meth=meth; | ||
| 18 | if ((ret->meth->init != NULL) && !ret->meth->init(ret)) | ||
| 19 | { | ||
| 20 | OPENSSL_free(ret); | ||
| 21 | ret=NULL; | ||
| 22 | } | ||
| 23 | return(ret); | ||
| 24 | } | ||
| 25 | |||
| 26 | void COMP_CTX_free(COMP_CTX *ctx) | ||
| 27 | { | ||
| 28 | if(ctx == NULL) | ||
| 29 | return; | ||
| 30 | |||
| 31 | if (ctx->meth->finish != NULL) | ||
| 32 | ctx->meth->finish(ctx); | ||
| 33 | |||
| 34 | OPENSSL_free(ctx); | ||
| 35 | } | ||
| 36 | |||
| 37 | int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen, | ||
| 38 | unsigned char *in, int ilen) | ||
| 39 | { | ||
| 40 | int ret; | ||
| 41 | if (ctx->meth->compress == NULL) | ||
| 42 | { | ||
| 43 | /* ZZZZZZZZZZZZZZZZZ */ | ||
| 44 | return(-1); | ||
| 45 | } | ||
| 46 | ret=ctx->meth->compress(ctx,out,olen,in,ilen); | ||
| 47 | if (ret > 0) | ||
| 48 | { | ||
| 49 | ctx->compress_in+=ilen; | ||
| 50 | ctx->compress_out+=ret; | ||
| 51 | } | ||
| 52 | return(ret); | ||
| 53 | } | ||
| 54 | |||
| 55 | int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen, | ||
| 56 | unsigned char *in, int ilen) | ||
| 57 | { | ||
| 58 | int ret; | ||
| 59 | |||
| 60 | if (ctx->meth->expand == NULL) | ||
| 61 | { | ||
| 62 | /* ZZZZZZZZZZZZZZZZZ */ | ||
| 63 | return(-1); | ||
| 64 | } | ||
| 65 | ret=ctx->meth->expand(ctx,out,olen,in,ilen); | ||
| 66 | if (ret > 0) | ||
| 67 | { | ||
| 68 | ctx->expand_in+=ilen; | ||
| 69 | ctx->expand_out+=ret; | ||
| 70 | } | ||
| 71 | return(ret); | ||
| 72 | } | ||
