|
0 |
--- debian/tmp/usr/include/openssl/bio.h
|
|
1 |
+++ debian/tmp/usr/include/openssl/bio.h
|
|
2 |
@@ -196,28 +196,32 @@
|
|
3 |
*/
|
|
4 |
#define BIO_FLAGS_MEM_RDONLY 0x200
|
|
5 |
|
|
6 |
-#define BIO_set_flags(b,f) ((b)->flags|=(f))
|
|
7 |
-#define BIO_get_flags(b) ((b)->flags)
|
|
8 |
+typedef struct bio_st BIO;
|
|
9 |
+
|
|
10 |
+void BIO_set_flags(BIO *b, int flags);
|
|
11 |
+int BIO_test_flags(const BIO *b, int flags);
|
|
12 |
+void BIO_clear_flags(BIO *b, int flags);
|
|
13 |
+
|
|
14 |
+#define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
|
|
15 |
#define BIO_set_retry_special(b) \
|
|
16 |
- ((b)->flags|=(BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
|
|
17 |
+ BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
|
|
18 |
#define BIO_set_retry_read(b) \
|
|
19 |
- ((b)->flags|=(BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
|
|
20 |
+ BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
|
|
21 |
#define BIO_set_retry_write(b) \
|
|
22 |
- ((b)->flags|=(BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
|
|
23 |
+ BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
|
|
24 |
|
|
25 |
/* These are normally used internally in BIOs */
|
|
26 |
-#define BIO_clear_flags(b,f) ((b)->flags&= ~(f))
|
|
27 |
#define BIO_clear_retry_flags(b) \
|
|
28 |
- ((b)->flags&= ~(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
|
|
29 |
+ BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
|
|
30 |
#define BIO_get_retry_flags(b) \
|
|
31 |
- ((b)->flags&(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
|
|
32 |
+ BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
|
|
33 |
|
|
34 |
/* These should be used by the application to tell why we should retry */
|
|
35 |
-#define BIO_should_read(a) ((a)->flags & BIO_FLAGS_READ)
|
|
36 |
-#define BIO_should_write(a) ((a)->flags & BIO_FLAGS_WRITE)
|
|
37 |
-#define BIO_should_io_special(a) ((a)->flags & BIO_FLAGS_IO_SPECIAL)
|
|
38 |
-#define BIO_retry_type(a) ((a)->flags & BIO_FLAGS_RWS)
|
|
39 |
-#define BIO_should_retry(a) ((a)->flags & BIO_FLAGS_SHOULD_RETRY)
|
|
40 |
+#define BIO_should_read(a) BIO_test_flags(a, BIO_FLAGS_READ)
|
|
41 |
+#define BIO_should_write(a) BIO_test_flags(a, BIO_FLAGS_WRITE)
|
|
42 |
+#define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
|
|
43 |
+#define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS)
|
|
44 |
+#define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
|
|
45 |
|
|
46 |
/* The next three are used in conjunction with the
|
|
47 |
* BIO_should_io_special() condition. After this returns true,
|
|
48 |
@@ -246,14 +250,14 @@
|
|
49 |
#define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
|
|
50 |
#define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
|
|
51 |
|
|
52 |
-#define BIO_set_callback(b,cb) ((b)->callback=(cb))
|
|
53 |
-#define BIO_set_callback_arg(b,arg) ((b)->cb_arg=(char *)(arg))
|
|
54 |
-#define BIO_get_callback_arg(b) ((b)->cb_arg)
|
|
55 |
-#define BIO_get_callback(b) ((b)->callback)
|
|
56 |
-#define BIO_method_name(b) ((b)->method->name)
|
|
57 |
-#define BIO_method_type(b) ((b)->method->type)
|
|
58 |
+long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long);
|
|
59 |
+void BIO_set_callback(BIO *b,
|
|
60 |
+ long (*callback)(struct bio_st *,int,const char *,int, long,long));
|
|
61 |
+char *BIO_get_callback_arg(const BIO *b);
|
|
62 |
+void BIO_set_callback_arg(BIO *b, char *arg);
|
|
63 |
|
|
64 |
-typedef struct bio_st BIO;
|
|
65 |
+const char * BIO_method_name(const BIO *b);
|
|
66 |
+int BIO_method_type(const BIO *b);
|
|
67 |
|
|
68 |
typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long);
|
|
69 |
|
|
70 |
--- debian/tmp/usr/include/openssl/evp.h
|
|
71 |
+++ debian/tmp/usr/include/openssl/evp.h
|
|
72 |
@@ -429,36 +429,36 @@
|
|
73 |
#define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
|
|
74 |
#define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
|
|
75 |
|
|
76 |
-#define EVP_MD_type(e) ((e)->type)
|
|
77 |
+int EVP_MD_type(const EVP_MD *md);
|
|
78 |
#define EVP_MD_nid(e) EVP_MD_type(e)
|
|
79 |
#define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_nid(e))
|
|
80 |
-#define EVP_MD_pkey_type(e) ((e)->pkey_type)
|
|
81 |
-#define EVP_MD_size(e) ((e)->md_size)
|
|
82 |
-#define EVP_MD_block_size(e) ((e)->block_size)
|
|
83 |
-
|
|
84 |
-#define EVP_MD_CTX_md(e) ((e)->digest)
|
|
85 |
-#define EVP_MD_CTX_size(e) EVP_MD_size((e)->digest)
|
|
86 |
-#define EVP_MD_CTX_block_size(e) EVP_MD_block_size((e)->digest)
|
|
87 |
-#define EVP_MD_CTX_type(e) EVP_MD_type((e)->digest)
|
|
88 |
+int EVP_MD_pkey_type(const EVP_MD *md);
|
|
89 |
+int EVP_MD_size(const EVP_MD *md);
|
|
90 |
+int EVP_MD_block_size(const EVP_MD *md);
|
|
91 |
+
|
|
92 |
+const EVP_MD * EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
|
|
93 |
+#define EVP_MD_CTX_size(e) EVP_MD_size(EVP_MD_CTX_md(e))
|
|
94 |
+#define EVP_MD_CTX_block_size(e) EVP_MD_block_size(EVP_MD_CTX_md(e))
|
|
95 |
+#define EVP_MD_CTX_type(e) EVP_MD_type(EVP_MD_CTX_md(e))
|
|
96 |
|
|
97 |
-#define EVP_CIPHER_nid(e) ((e)->nid)
|
|
98 |
+int EVP_CIPHER_nid(const EVP_CIPHER *cipher);
|
|
99 |
#define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
|
|
100 |
-#define EVP_CIPHER_block_size(e) ((e)->block_size)
|
|
101 |
-#define EVP_CIPHER_key_length(e) ((e)->key_len)
|
|
102 |
-#define EVP_CIPHER_iv_length(e) ((e)->iv_len)
|
|
103 |
-#define EVP_CIPHER_flags(e) ((e)->flags)
|
|
104 |
-#define EVP_CIPHER_mode(e) (((e)->flags) & EVP_CIPH_MODE)
|
|
105 |
-
|
|
106 |
-#define EVP_CIPHER_CTX_cipher(e) ((e)->cipher)
|
|
107 |
-#define EVP_CIPHER_CTX_nid(e) ((e)->cipher->nid)
|
|
108 |
-#define EVP_CIPHER_CTX_block_size(e) ((e)->cipher->block_size)
|
|
109 |
-#define EVP_CIPHER_CTX_key_length(e) ((e)->key_len)
|
|
110 |
-#define EVP_CIPHER_CTX_iv_length(e) ((e)->cipher->iv_len)
|
|
111 |
-#define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data)
|
|
112 |
-#define EVP_CIPHER_CTX_set_app_data(e,d) ((e)->app_data=(char *)(d))
|
|
113 |
+int EVP_CIPHER_block_size(const EVP_CIPHER *cipher);
|
|
114 |
+int EVP_CIPHER_key_length(const EVP_CIPHER *cipher);
|
|
115 |
+int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher);
|
|
116 |
+unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher);
|
|
117 |
+#define EVP_CIPHER_mode(e) (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
|
|
118 |
+
|
|
119 |
+const EVP_CIPHER * EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
|
|
120 |
+int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
|
|
121 |
+int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
|
|
122 |
+int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
|
|
123 |
+int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
|
|
124 |
+void * EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
|
|
125 |
+void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
|
|
126 |
#define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
|
|
127 |
-#define EVP_CIPHER_CTX_flags(e) ((e)->cipher->flags)
|
|
128 |
-#define EVP_CIPHER_CTX_mode(e) ((e)->cipher->flags & EVP_CIPH_MODE)
|
|
129 |
+unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
|
|
130 |
+#define EVP_CIPHER_CTX_mode(e) (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
|
|
131 |
|
|
132 |
#define EVP_ENCODE_LENGTH(l) (((l+2)/3*4)+(l/48+1)*2+80)
|
|
133 |
#define EVP_DECODE_LENGTH(l) ((l+3)/4*3+80)
|
|
134 |
@@ -479,10 +479,14 @@
|
|
135 |
#endif
|
|
136 |
#define BIO_get_md(b,mdp) BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
|
|
137 |
#define BIO_get_md_ctx(b,mdcp) BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
|
|
138 |
+#define BIO_set_md_ctx(b,mdcp) BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)
|
|
139 |
#define BIO_get_cipher_status(b) BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
|
|
140 |
#define BIO_get_cipher_ctx(b,c_pp) BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
|
|
141 |
|
|
142 |
-#define EVP_Cipher(c,o,i,l) (c)->cipher->do_cipher((c),(o),(i),(l))
|
|
143 |
+int EVP_Cipher(EVP_CIPHER_CTX *c,
|
|
144 |
+ unsigned char *out,
|
|
145 |
+ const unsigned char *in,
|
|
146 |
+ unsigned int inl);
|
|
147 |
|
|
148 |
#define EVP_add_cipher_alias(n,alias) \
|
|
149 |
OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
|
|
150 |
@@ -498,9 +502,9 @@
|
|
151 |
EVP_MD_CTX *EVP_MD_CTX_create(void);
|
|
152 |
void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
|
|
153 |
int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in);
|
|
154 |
-#define EVP_MD_CTX_set_flags(ctx,flgs) ((ctx)->flags|=(flgs))
|
|
155 |
-#define EVP_MD_CTX_clear_flags(ctx,flgs) ((ctx)->flags&=~(flgs))
|
|
156 |
-#define EVP_MD_CTX_test_flags(ctx,flgs) ((ctx)->flags&(flgs))
|
|
157 |
+void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
|
|
158 |
+void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
|
|
159 |
+int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx,int flags);
|
|
160 |
int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
|
|
161 |
int EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d,
|
|
162 |
size_t cnt);
|
|
163 |
--- debian/tmp/usr/include/openssl/ssl.h
|
|
164 |
+++ debian/tmp/usr/include/openssl/ssl.h
|
|
165 |
@@ -791,18 +791,18 @@
|
|
166 |
#define SSL_CTX_sess_cache_full(ctx) \
|
|
167 |
SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
|
|
168 |
|
|
169 |
-#define SSL_CTX_sess_set_new_cb(ctx,cb) ((ctx)->new_session_cb=(cb))
|
|
170 |
-#define SSL_CTX_sess_get_new_cb(ctx) ((ctx)->new_session_cb)
|
|
171 |
-#define SSL_CTX_sess_set_remove_cb(ctx,cb) ((ctx)->remove_session_cb=(cb))
|
|
172 |
-#define SSL_CTX_sess_get_remove_cb(ctx) ((ctx)->remove_session_cb)
|
|
173 |
-#define SSL_CTX_sess_set_get_cb(ctx,cb) ((ctx)->get_session_cb=(cb))
|
|
174 |
-#define SSL_CTX_sess_get_get_cb(ctx) ((ctx)->get_session_cb)
|
|
175 |
-#define SSL_CTX_set_info_callback(ctx,cb) ((ctx)->info_callback=(cb))
|
|
176 |
-#define SSL_CTX_get_info_callback(ctx) ((ctx)->info_callback)
|
|
177 |
-#define SSL_CTX_set_client_cert_cb(ctx,cb) ((ctx)->client_cert_cb=(cb))
|
|
178 |
-#define SSL_CTX_get_client_cert_cb(ctx) ((ctx)->client_cert_cb)
|
|
179 |
-#define SSL_CTX_set_cookie_generate_cb(ctx,cb) ((ctx)->app_gen_cookie_cb=(cb))
|
|
180 |
-#define SSL_CTX_set_cookie_verify_cb(ctx,cb) ((ctx)->app_verify_cookie_cb=(cb))
|
|
181 |
+void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess));
|
|
182 |
+int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl, SSL_SESSION *sess);
|
|
183 |
+void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess));
|
|
184 |
+void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx, SSL_SESSION *sess);
|
|
185 |
+void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, unsigned char *data,int len,int *copy));
|
|
186 |
+SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, unsigned char *Data, int len, int *copy);
|
|
187 |
+void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,int type,int val));
|
|
188 |
+void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val);
|
|
189 |
+void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey));
|
|
190 |
+int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
|
|
191 |
+void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len));
|
|
192 |
+void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len));
|
|
193 |
|
|
194 |
#define SSL_NOTHING 1
|
|
195 |
#define SSL_WRITING 2
|