Preliminary streaming ASN1 encode support.

[openssl.git] / crypto / comp / comp.h

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 4d81062b717aab94750c5767f74f091347906ac6..ab48b78ae97124b187d20104700914426fceedfd 100644 (file)
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -2,12 +2,12 @@
 #ifndef HEADER_COMP_H
 #define HEADER_COMP_H
 
+#include <openssl/crypto.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
-#include <openssl/crypto.h>
-
 typedef struct comp_method_st
        {
        int type;               /* NID for compression library */
@@ -17,6 +17,7 @@ typedef struct comp_method_st
        int (*compress)();
        int (*expand)();
        long (*ctrl)();
+       long (*callback_ctrl)();
        } COMP_METHOD;
 
 typedef struct comp_ctx_st
@@ -30,7 +31,6 @@ typedef struct comp_ctx_st
        CRYPTO_EX_DATA  ex_data;
        } COMP_CTX;
 
-#ifndef NOPROTO
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
 void COMP_CTX_free(COMP_CTX *ctx);
@@ -39,26 +39,13 @@ int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
        unsigned char *in, int ilen);
 COMP_METHOD *COMP_rle(void );
-#ifdef ZLIB
 COMP_METHOD *COMP_zlib(void );
-#endif
 
-#else
-
-COMP_CTX *COMP_CTX_new();
-void COMP_CTX_free();
-int COMP_compress_block();
-int COMP_expand_block();
-COMP_METHOD *COMP_rle();
-#ifdef ZLIB
-COMP_METHOD *COMP_zlib();
-#endif
-
-#endif
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_COMP_strings(void);
 
 /* Error codes for the COMP functions. */
 
@@ -70,4 +57,3 @@ COMP_METHOD *COMP_zlib();
 }
 #endif
 #endif
-