annotate src/mail/ngx_mail_ssl_module.c @ 510:24b676623d4f NGINX_0_8_7

nginx 0.8.7 *) Change: minimum supported OpenSSL version is 0.9.7. *) Change: the "ask" parameter of the "ssl_verify_client" directive was changed to the "optional" parameter and now it checks a client certificate if it was offered. Thanks to Brice Figureau. *) Feature: the $ssl_client_verify variable. Thanks to Brice Figureau. *) Feature: the "ssl_crl" directive. Thanks to Brice Figureau. *) Feature: the "proxy" parameter of the "geo" directive. *) Feature: the "image_filter" directive supports variables for setting size. *) Bugfix: the $ssl_client_cert variable usage corrupted memory; the bug had appeared in 0.7.7. Thanks to Sergey Zhuravlev. *) Bugfix: "proxy_pass_header" and "fastcgi_pass_header" directives did not pass to a client the "X-Accel-Redirect", "X-Accel-Limit-Rate", "X-Accel-Buffering", and "X-Accel-Charset" lines from backend response header. Thanks to Maxim Dounin. *) Bugfix: in handling "Last-Modified" and "Accept-Ranges" backend response header lines; the bug had appeared in 0.7.44. Thanks to Maxim Dounin. *) Bugfix: the "[alert] zero size buf" error if subrequest returns an empty response; the bug had appeared in 0.8.5.
author Igor Sysoev <http://sysoev.ru>
date Mon, 27 Jul 2009 00:00:00 +0400
parents f39b9e29530d
children a52c99698e7f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 /*
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3 * Copyright (C) Igor Sysoev
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4 */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 #include <ngx_config.h>
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 #include <ngx_core.h>
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 #include <ngx_mail.h>
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11
390
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents: 380
diff changeset
12 #define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP"
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 static void *ngx_mail_ssl_create_conf(ngx_conf_t *cf);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16 static char *ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child);
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
17
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
18 static char *ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
19 void *conf);
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
20 static char *ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
21 void *conf);
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 static char *ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 void *conf);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26 static ngx_conf_enum_t ngx_http_starttls_state[] = {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27 { ngx_string("off"), NGX_MAIL_STARTTLS_OFF },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 { ngx_string("on"), NGX_MAIL_STARTTLS_ON },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 { ngx_string("only"), NGX_MAIL_STARTTLS_ONLY },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 { ngx_null_string, 0 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 };
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 static ngx_conf_bitmask_t ngx_mail_ssl_protocols[] = {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 { ngx_string("SSLv2"), NGX_SSL_SSLv2 },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37 { ngx_string("SSLv3"), NGX_SSL_SSLv3 },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 { ngx_string("TLSv1"), NGX_SSL_TLSv1 },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39 { ngx_null_string, 0 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 };
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 static ngx_command_t ngx_mail_ssl_commands[] = {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 { ngx_string("ssl"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
47 ngx_mail_ssl_enable,
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49 offsetof(ngx_mail_ssl_conf_t, enable),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 { ngx_string("starttls"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
54 ngx_mail_ssl_starttls,
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56 offsetof(ngx_mail_ssl_conf_t, starttls),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 ngx_http_starttls_state },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 { ngx_string("ssl_certificate"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 ngx_conf_set_str_slot,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 offsetof(ngx_mail_ssl_conf_t, certificate),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 { ngx_string("ssl_certificate_key"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68 ngx_conf_set_str_slot,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70 offsetof(ngx_mail_ssl_conf_t, certificate_key),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72
380
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
73 { ngx_string("ssl_dhparam"),
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
74 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
75 ngx_conf_set_str_slot,
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
76 NGX_MAIL_SRV_CONF_OFFSET,
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
77 offsetof(ngx_mail_ssl_conf_t, dhparam),
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
78 NULL },
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
79
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
80 { ngx_string("ssl_protocols"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
81 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82 ngx_conf_set_bitmask_slot,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
83 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84 offsetof(ngx_mail_ssl_conf_t, protocols),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85 &ngx_mail_ssl_protocols },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 { ngx_string("ssl_ciphers"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
88 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
89 ngx_conf_set_str_slot,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
90 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91 offsetof(ngx_mail_ssl_conf_t, ciphers),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
92 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94 { ngx_string("ssl_prefer_server_ciphers"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
96 ngx_conf_set_flag_slot,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
97 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 offsetof(ngx_mail_ssl_conf_t, prefer_server_ciphers),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101 { ngx_string("ssl_session_cache"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
102 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE12,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
103 ngx_mail_ssl_session_cache,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
104 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
105 0,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
106 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
107
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
108 { ngx_string("ssl_session_timeout"),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
109 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
110 ngx_conf_set_sec_slot,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
111 NGX_MAIL_SRV_CONF_OFFSET,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112 offsetof(ngx_mail_ssl_conf_t, session_timeout),
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
113 NULL },
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
115 ngx_null_command
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
116 };
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
117
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
118
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
119 static ngx_mail_module_t ngx_mail_ssl_module_ctx = {
336
1c519aff5c0c nginx 0.6.12
Igor Sysoev <http://sysoev.ru>
parents: 290
diff changeset
120 NULL, /* protocol */
1c519aff5c0c nginx 0.6.12
Igor Sysoev <http://sysoev.ru>
parents: 290
diff changeset
121
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
122 NULL, /* create main configuration */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
123 NULL, /* init main configuration */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
124
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
125 ngx_mail_ssl_create_conf, /* create server configuration */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
126 ngx_mail_ssl_merge_conf /* merge server configuration */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
127 };
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
128
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
129
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
130 ngx_module_t ngx_mail_ssl_module = {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
131 NGX_MODULE_V1,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
132 &ngx_mail_ssl_module_ctx, /* module context */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
133 ngx_mail_ssl_commands, /* module directives */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
134 NGX_MAIL_MODULE, /* module type */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
135 NULL, /* init master */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
136 NULL, /* init module */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
137 NULL, /* init process */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
138 NULL, /* init thread */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
139 NULL, /* exit thread */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
140 NULL, /* exit process */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
141 NULL, /* exit master */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
142 NGX_MODULE_V1_PADDING
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
143 };
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
144
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
145
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
146 static ngx_str_t ngx_mail_ssl_sess_id_ctx = ngx_string("MAIL");
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
147
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
148
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
149 static void *
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
150 ngx_mail_ssl_create_conf(ngx_conf_t *cf)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
151 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
152 ngx_mail_ssl_conf_t *scf;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
153
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
154 scf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_ssl_conf_t));
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
155 if (scf == NULL) {
496
f39b9e29530d nginx 0.8.0
Igor Sysoev <http://sysoev.ru>
parents: 482
diff changeset
156 return NULL;
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
157 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
158
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
159 /*
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
160 * set by ngx_pcalloc():
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
161 *
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
162 * scf->protocols = 0;
380
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
163 * scf->certificate = { 0, NULL };
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
164 * scf->certificate_key = { 0, NULL };
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
165 * scf->dhparam = { 0, NULL };
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
166 * scf->ciphers.len = 0;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
167 * scf->ciphers.data = NULL;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
168 * scf->shm_zone = NULL;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
169 */
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
170
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
171 scf->enable = NGX_CONF_UNSET;
482
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 404
diff changeset
172 scf->starttls = NGX_CONF_UNSET_UINT;
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
173 scf->prefer_server_ciphers = NGX_CONF_UNSET;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
174 scf->builtin_session_cache = NGX_CONF_UNSET;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
175 scf->session_timeout = NGX_CONF_UNSET;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
176
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
177 return scf;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
178 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
179
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
180
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
181 static char *
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
182 ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
183 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
184 ngx_mail_ssl_conf_t *prev = parent;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
185 ngx_mail_ssl_conf_t *conf = child;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
186
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
187 char *mode;
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
188 ngx_pool_cleanup_t *cln;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
189
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
190 ngx_conf_merge_value(conf->enable, prev->enable, 0);
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
191 ngx_conf_merge_uint_value(conf->starttls, prev->starttls,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
192 NGX_MAIL_STARTTLS_OFF);
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
193
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
194 ngx_conf_merge_value(conf->session_timeout,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
195 prev->session_timeout, 300);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
196
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
197 ngx_conf_merge_value(conf->prefer_server_ciphers,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
198 prev->prefer_server_ciphers, 0);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
199
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
200 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
201 (NGX_CONF_BITMASK_SET
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
202 |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1));
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
203
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
204 ngx_conf_merge_str_value(conf->certificate, prev->certificate, "");
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
205 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, "");
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
206
380
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
207 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, "");
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
208
390
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents: 380
diff changeset
209 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS);
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
210
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
211
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
212 conf->ssl.log = cf->log;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
213
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
214 if (conf->enable) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
215 mode = "ssl";
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
216
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
217 } else if (conf->starttls != NGX_MAIL_STARTTLS_OFF) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
218 mode = "starttls";
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
219
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
220 } else {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
221 mode = "";
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
222 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
223
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
224 if (*mode) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
225
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
226 if (conf->certificate.len == 0) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
227 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
228 "no \"ssl_certificate\" is defined for "
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
229 "the \"%s\" directive in %s:%ui",
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
230 mode, conf->file, conf->line);
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
231 return NGX_CONF_ERROR;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
232 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
233
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
234 if (conf->certificate_key.len == 0) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
235 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
236 "no \"ssl_certificate_key\" is defined for "
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
237 "the \"%s\" directive in %s:%ui",
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
238 mode, conf->file, conf->line);
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
239 return NGX_CONF_ERROR;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
240 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
241
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
242 } else {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
243
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
244 if (conf->certificate.len == 0) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
245 return NGX_CONF_OK;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
246 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
247
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
248 if (conf->certificate_key.len == 0) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
249 ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
250 "no \"ssl_certificate_key\" is defined "
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
251 "for certificate \"%V\"",
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
252 &conf->certificate);
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
253 return NGX_CONF_ERROR;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
254 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
255 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
256
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
257 if (ngx_ssl_create(&conf->ssl, conf->protocols, NULL) != NGX_OK) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
258 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
259 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
260
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
261 cln = ngx_pool_cleanup_add(cf->pool, 0);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
262 if (cln == NULL) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
263 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
264 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
265
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
266 cln->handler = ngx_ssl_cleanup_ctx;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
267 cln->data = &conf->ssl;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
268
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
269 if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
270 &conf->certificate_key)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
271 != NGX_OK)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
272 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
273 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
274 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
275
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
276 if (conf->ciphers.len) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
277 if (SSL_CTX_set_cipher_list(conf->ssl.ctx,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
278 (const char *) conf->ciphers.data)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
279 == 0)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
280 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
281 ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
282 "SSL_CTX_set_cipher_list(\"%V\") failed",
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
283 &conf->ciphers);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
284 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
285 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
286
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
287 if (conf->prefer_server_ciphers) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
288 SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
289 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
291 if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
292 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
293 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
294
380
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
295 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) {
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
296 return NGX_CONF_ERROR;
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
297 }
bc21d9cd9c54 nginx 0.7.2
Igor Sysoev <http://sysoev.ru>
parents: 378
diff changeset
298
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
299 ngx_conf_merge_value(conf->builtin_session_cache,
378
820f6378fc00 nginx 0.7.1
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
300 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE);
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
301
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
302 if (conf->shm_zone == NULL) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
303 conf->shm_zone = prev->shm_zone;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
304 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
305
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
306 if (ngx_ssl_session_cache(&conf->ssl, &ngx_mail_ssl_sess_id_ctx,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
307 conf->builtin_session_cache,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
308 conf->shm_zone, conf->session_timeout)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
309 != NGX_OK)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
310 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
311 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
312 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
313
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
314 return NGX_CONF_OK;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
315 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
316
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
317
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
318 static char *
404
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
319 ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
320 {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
321 ngx_mail_ssl_conf_t *scf = conf;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
322
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
323 char *rv;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
324
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
325 rv = ngx_conf_set_flag_slot(cf, cmd, conf);
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
326
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
327 if (rv != NGX_CONF_OK) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
328 return rv;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
329 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
330
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
331 if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
332 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
333 "\"starttls\" directive conflicts with \"ssl on\"");
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
334 return NGX_CONF_ERROR;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
335 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
336
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
337 scf->file = cf->conf_file->file.name.data;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
338 scf->line = cf->conf_file->line;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
339
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
340 return NGX_CONF_OK;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
341 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
342
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
343
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
344 static char *
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
345 ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
346 {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
347 ngx_mail_ssl_conf_t *scf = conf;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
348
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
349 char *rv;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
350
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
351 rv = ngx_conf_set_enum_slot(cf, cmd, conf);
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
352
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
353 if (rv != NGX_CONF_OK) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
354 return rv;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
355 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
356
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
357 if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) {
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
358 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
359 "\"ssl\" directive conflicts with \"starttls\"");
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
360 return NGX_CONF_ERROR;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
361 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
362
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
363 scf->file = cf->conf_file->file.name.data;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
364 scf->line = cf->conf_file->line;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
365
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
366 return NGX_CONF_OK;
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
367 }
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
368
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
369
a094317ba307 nginx 0.7.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
370 static char *
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
371 ngx_mail_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
372 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
373 ngx_mail_ssl_conf_t *scf = conf;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
374
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
375 size_t len;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
376 ngx_str_t *value, name, size;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
377 ngx_int_t n;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
378 ngx_uint_t i, j;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
379
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
380 value = cf->args->elts;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
381
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
382 for (i = 1; i < cf->args->nelts; i++) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
383
358
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 336
diff changeset
384 if (ngx_strcmp(value[i].data, "off") == 0) {
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 336
diff changeset
385 scf->builtin_session_cache = NGX_SSL_NO_SCACHE;
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 336
diff changeset
386 continue;
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 336
diff changeset
387 }
9121a0a91f47 nginx 0.6.23
Igor Sysoev <http://sysoev.ru>
parents: 336
diff changeset
388
378
820f6378fc00 nginx 0.7.1
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
389 if (ngx_strcmp(value[i].data, "none") == 0) {
820f6378fc00 nginx 0.7.1
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
390 scf->builtin_session_cache = NGX_SSL_NONE_SCACHE;
820f6378fc00 nginx 0.7.1
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
391 continue;
820f6378fc00 nginx 0.7.1
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
392 }
820f6378fc00 nginx 0.7.1
Igor Sysoev <http://sysoev.ru>
parents: 358
diff changeset
393
290
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
394 if (ngx_strcmp(value[i].data, "builtin") == 0) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
395 scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
396 continue;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
397 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
398
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
399 if (value[i].len > sizeof("builtin:") - 1
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
400 && ngx_strncmp(value[i].data, "builtin:", sizeof("builtin:") - 1)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
401 == 0)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
402 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
403 n = ngx_atoi(value[i].data + sizeof("builtin:") - 1,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
404 value[i].len - (sizeof("builtin:") - 1));
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
405
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
406 if (n == NGX_ERROR) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
407 goto invalid;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
408 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
409
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
410 scf->builtin_session_cache = n;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
411
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
412 continue;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
413 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
414
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
415 if (value[i].len > sizeof("shared:") - 1
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
416 && ngx_strncmp(value[i].data, "shared:", sizeof("shared:") - 1)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
417 == 0)
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
418 {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
419 len = 0;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
420
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
421 for (j = sizeof("shared:") - 1; j < value[i].len; j++) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
422 if (value[i].data[j] == ':') {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
423 break;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
424 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
425
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
426 len++;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
427 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
428
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
429 if (len == 0) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
430 goto invalid;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
431 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
432
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
433 name.len = len;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
434 name.data = value[i].data + sizeof("shared:") - 1;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
435
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
436 size.len = value[i].len - j - 1;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
437 size.data = name.data + len + 1;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
438
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
439 n = ngx_parse_size(&size);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
440
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
441 if (n == NGX_ERROR) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
442 goto invalid;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
443 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
444
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
445 if (n < (ngx_int_t) (8 * ngx_pagesize)) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
446 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
447 "session cache \"%V\" is too small",
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
448 &value[i]);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
449
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
450 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
451 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
452
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
453 scf->shm_zone = ngx_shared_memory_add(cf, &name, n,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
454 &ngx_mail_ssl_module);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
455 if (scf->shm_zone == NULL) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
456 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
457 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
458
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
459 continue;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
460 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
461
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
462 goto invalid;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
463 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
464
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
465 if (scf->shm_zone && scf->builtin_session_cache == NGX_CONF_UNSET) {
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
466 scf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
467 }
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
468
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
469 return NGX_CONF_OK;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
470
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
471 invalid:
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
472
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
473 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
474 "invalid session cache \"%V\"", &value[i]);
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
475
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
476 return NGX_CONF_ERROR;
f745bf973510 nginx 0.5.15
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
477 }