projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
As with RSA, which was modified recently, this change makes it possible to
[oweals/openssl.git]
/
crypto
/
comp
/
comp.h
diff --git
a/crypto/comp/comp.h
b/crypto/comp/comp.h
index 7870a1e73656740a5b666adbfdc197609c8e1e85..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
#ifndef HEADER_COMP_H
#define HEADER_COMP_H
+#include <openssl/crypto.h>
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
-#include <openssl/crypto.h>
-
typedef struct comp_method_st
{
int type; /* NID for compression library */
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)();
int (*compress)();
int (*expand)();
long (*ctrl)();
+ long (*callback_ctrl)();
} COMP_METHOD;
typedef struct comp_ctx_st
} COMP_METHOD;
typedef struct comp_ctx_st
@@
-30,7
+31,6
@@
typedef struct comp_ctx_st
CRYPTO_EX_DATA ex_data;
} COMP_CTX;
CRYPTO_EX_DATA ex_data;
} COMP_CTX;
-#ifndef NOPROTO
COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
void COMP_CTX_free(COMP_CTX *ctx);
COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
void COMP_CTX_free(COMP_CTX *ctx);
@@
-39,26
+39,21
@@
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 );
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 );
COMP_METHOD *COMP_zlib(void );
-#endif
-#else
+/* 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. */
-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
+/* Function codes. */
+
+/* Reason codes. */
-#endif
-/* BEGIN ERROR CODES */
-
#ifdef __cplusplus
}
#endif
#endif
#ifdef __cplusplus
}
#endif
#endif
-