Update OpenSSL to 1.0.2a.

[ffftp/ffftp.git] / contrib / openssl / include / openssl / comp.h

diff --git a/contrib/openssl/include/openssl/comp.h b/contrib/openssl/include/openssl/comp.h
index 4b405c7..b366c94 100644 (file)
--- a/contrib/openssl/include/openssl/comp.h
+++ b/contrib/openssl/include/openssl/comp.h
@@ -1,80 +1,79 @@
-
-#ifndef HEADER_COMP_H
-#define HEADER_COMP_H
-
-#include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-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)(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;
-
-struct comp_ctx_st
-       {
-       COMP_METHOD *meth;
-       unsigned long compress_in;
-       unsigned long compress_out;
-       unsigned long expand_in;
-       unsigned long expand_out;
-
-       CRYPTO_EX_DATA  ex_data;
-       };
-
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
-void COMP_CTX_free(COMP_CTX *ctx);
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-       unsigned char *in, int ilen);
-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
- * 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. */
-
-/* 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
-}
-#endif
-#endif
+\r
+#ifndef HEADER_COMP_H\r
+# define HEADER_COMP_H\r
+\r
+# include <openssl/crypto.h>\r
+\r
+#ifdef  __cplusplus\r
+extern "C" {\r
+#endif\r
+\r
+typedef struct comp_ctx_st COMP_CTX;\r
+\r
+typedef struct comp_method_st {\r
+    int type;                   /* NID for compression library */\r
+    const char *name;           /* A text string to identify the library */\r
+    int (*init) (COMP_CTX *ctx);\r
+    void (*finish) (COMP_CTX *ctx);\r
+    int (*compress) (COMP_CTX *ctx,\r
+                     unsigned char *out, unsigned int olen,\r
+                     unsigned char *in, unsigned int ilen);\r
+    int (*expand) (COMP_CTX *ctx,\r
+                   unsigned char *out, unsigned int olen,\r
+                   unsigned char *in, unsigned int ilen);\r
+    /*\r
+     * The following two do NOTHING, but are kept for backward compatibility\r
+     */\r
+    long (*ctrl) (void);\r
+    long (*callback_ctrl) (void);\r
+} COMP_METHOD;\r
+\r
+struct comp_ctx_st {\r
+    COMP_METHOD *meth;\r
+    unsigned long compress_in;\r
+    unsigned long compress_out;\r
+    unsigned long expand_in;\r
+    unsigned long expand_out;\r
+    CRYPTO_EX_DATA ex_data;\r
+};\r
+\r
+COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);\r
+void COMP_CTX_free(COMP_CTX *ctx);\r
+int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,\r
+                        unsigned char *in, int ilen);\r
+int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,\r
+                      unsigned char *in, int ilen);\r
+COMP_METHOD *COMP_rle(void);\r
+COMP_METHOD *COMP_zlib(void);\r
+void COMP_zlib_cleanup(void);\r
+\r
+# ifdef HEADER_BIO_H\r
+#  ifdef ZLIB\r
+BIO_METHOD *BIO_f_zlib(void);\r
+#  endif\r
+# endif\r
+\r
+/* BEGIN ERROR CODES */\r
+/*\r
+ * The following lines are auto generated by the script mkerr.pl. Any changes\r
+ * made after this point may be overwritten when the script is next run.\r
+ */\r
+void ERR_load_COMP_strings(void);\r
+\r
+/* Error codes for the COMP functions. */\r
+\r
+/* Function codes. */\r
+# define COMP_F_BIO_ZLIB_FLUSH                            99\r
+# define COMP_F_BIO_ZLIB_NEW                              100\r
+# define COMP_F_BIO_ZLIB_READ                             101\r
+# define COMP_F_BIO_ZLIB_WRITE                            102\r
+\r
+/* Reason codes. */\r
+# define COMP_R_ZLIB_DEFLATE_ERROR                        99\r
+# define COMP_R_ZLIB_INFLATE_ERROR                        100\r
+# define COMP_R_ZLIB_NOT_SUPPORTED                        101\r
+\r
+#ifdef  __cplusplus\r
+}\r
+#endif\r
+#endif\r