import of OpenSSL 0.9.8h

1 files changed, 29 insertions, 8 deletions

diff --git a/src/lib/libcrypto/comp/comp.h b/src/lib/libcrypto/comp/comp.h
index ab48b78ae9..4b405c7d49 100644
--- a/src/lib/libcrypto/comp/comp.h
+++ b/src/lib/libcrypto/comp/comp.h
@@ -8,19 +8,26 @@
 extern "C" {
 #endif
 
+typedef struct comp_ctx_st COMP_CTX;
+
 typedef struct comp_method_st
         {
         int type;               /* NID for compression library */
         const char *name;       /* A text string to identify the library */
-        int (*init)();
-        void (*finish)();
-        int (*compress)();
-        int (*expand)();
-        long (*ctrl)();
-        long (*callback_ctrl)();
+        int (*init)(COMP_CTX *ctx);
+        void (*finish)(COMP_CTX *ctx);
+        int (*compress)(COMP_CTX *ctx,
+                        unsigned char *out, unsigned int olen,
+                        unsigned char *in, unsigned int ilen);
+        int (*expand)(COMP_CTX *ctx,
+                      unsigned char *out, unsigned int olen,
+                      unsigned char *in, unsigned int ilen);
+        /* The following two do NOTHING, but are kept for backward compatibility */
+        long (*ctrl)(void);
+        long (*callback_ctrl)(void);
         } COMP_METHOD;
 
-typedef struct comp_ctx_st
+struct comp_ctx_st
         {
         COMP_METHOD *meth;
         unsigned long compress_in;
@@ -29,7 +36,7 @@ typedef struct comp_ctx_st
         unsigned long expand_out;
 
         CRYPTO_EX_DATA  ex_data;
-        } COMP_CTX;
+        };
 
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
@@ -40,6 +47,13 @@ int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
         unsigned char *in, int ilen);
 COMP_METHOD *COMP_rle(void );
 COMP_METHOD *COMP_zlib(void );
+void COMP_zlib_cleanup(void);
+
+#ifdef HEADER_BIO_H
+#ifdef ZLIB
+BIO_METHOD *BIO_f_zlib(void);
+#endif
+#endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -50,8 +64,15 @@ void ERR_load_COMP_strings(void);
 /* Error codes for the COMP functions. */
 
 /* Function codes. */
+#define COMP_F_BIO_ZLIB_FLUSH                            99
+#define COMP_F_BIO_ZLIB_NEW                              100
+#define COMP_F_BIO_ZLIB_READ                             101
+#define COMP_F_BIO_ZLIB_WRITE                            102
 
 /* Reason codes. */
+#define COMP_R_ZLIB_DEFLATE_ERROR                        99
+#define COMP_R_ZLIB_INFLATE_ERROR                        100
+#define COMP_R_ZLIB_NOT_SUPPORTED                        101
 
 #ifdef  __cplusplus
 }