View | Details | Raw Unified | Return to bug 206383 | Differences between
and this patch

Collapse All | Expand All

(-)b/src/imapfilter.c (-1 / +10 lines)
Lines 21-27 Link Here
21
21
22
extern buffer ibuf, obuf, nbuf, cbuf;
22
extern buffer ibuf, obuf, nbuf, cbuf;
23
extern regexp responses[];
23
extern regexp responses[];
24
extern SSL_CTX *ssl3ctx, *ssl23ctx, *tls1ctx;
24
extern SSL_CTX *ssl23ctx, *tls1ctx;
25
#ifndef OPENSSL_NO_SSL3_METHOD
26
extern SSL_CTX *ssl3ctx;
27
#endif
25
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
28
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
26
extern SSL_CTX *tls11ctx, *tls12ctx;
29
extern SSL_CTX *tls11ctx, *tls12ctx;
27
#endif
30
#endif
Lines 114-120 main(int argc, char *argv[]) Link Here
114
117
115
	SSL_library_init();
118
	SSL_library_init();
116
	SSL_load_error_strings();
119
	SSL_load_error_strings();
120
#ifndef OPENSSL_NO_SSL3_METHOD
117
	ssl3ctx = SSL_CTX_new(SSLv3_client_method());
121
	ssl3ctx = SSL_CTX_new(SSLv3_client_method());
122
#endif
118
	ssl23ctx = SSL_CTX_new(SSLv23_client_method());
123
	ssl23ctx = SSL_CTX_new(SSLv23_client_method());
119
	tls1ctx = SSL_CTX_new(TLSv1_client_method());
124
	tls1ctx = SSL_CTX_new(TLSv1_client_method());
120
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
125
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
Lines 125-131 main(int argc, char *argv[]) Link Here
125
		capath = opts.truststore;
130
		capath = opts.truststore;
126
	else if (exists_file(opts.truststore))
131
	else if (exists_file(opts.truststore))
127
		cafile = opts.truststore;
132
		cafile = opts.truststore;
133
#ifndef OPENSSL_NO_SSL3_METHOD
128
	SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath);
134
	SSL_CTX_load_verify_locations(ssl3ctx, cafile, capath);
135
#endif
129
	SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath);
136
	SSL_CTX_load_verify_locations(ssl23ctx, cafile, capath);
130
	SSL_CTX_load_verify_locations(tls1ctx, cafile, capath);
137
	SSL_CTX_load_verify_locations(tls1ctx, cafile, capath);
131
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
138
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
Lines 150-156 main(int argc, char *argv[]) Link Here
150
#endif
157
#endif
151
	stop_lua();
158
	stop_lua();
152
159
160
#ifndef OPENSSL_NO_SSL3_METHOD
153
	SSL_CTX_free(ssl3ctx);
161
	SSL_CTX_free(ssl3ctx);
162
#endif
154
	SSL_CTX_free(ssl23ctx);
163
	SSL_CTX_free(ssl23ctx);
155
	SSL_CTX_free(tls1ctx);
164
	SSL_CTX_free(tls1ctx);
156
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL
165
#if OPENSSL_VERSION_NUMBER >= 0x01000100fL

Return to bug 206383