Mercurial > hg > nginx
annotate src/http/modules/ngx_http_ssl_module.c @ 4400:a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Support for TLSv1.1 and TLSv1.2 protocols was introduced in OpenSSL 1.0.1
(-beta1 was recently released). This change makes it possible to disable
these protocols and/or enable them without other protocols.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 11 Jan 2012 11:15:00 +0000 |
| parents | e444e8f6538b |
| children | d620f497c50f |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
396
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
396
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
396
diff
changeset
|
4 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
396
diff
changeset
|
5 |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
6 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 #include <ngx_config.h> |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_core.h> |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_http.h> |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
| 573 | 11 |
| 671 | 12 typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c, |
| 13 ngx_pool_t *pool, ngx_str_t *s); | |
| 611 | 14 |
| 15 | |
| 3960 | 16 #define NGX_DEFAULT_CIPHERS "HIGH:!aNULL:!MD5" |
| 17 #define NGX_DEFAULT_ECDH_CURVE "prime256v1" | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
18 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
19 |
| 671 | 20 static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r, |
| 611 | 21 ngx_http_variable_value_t *v, uintptr_t data); |
| 671 | 22 static ngx_int_t ngx_http_ssl_variable(ngx_http_request_t *r, |
| 647 | 23 ngx_http_variable_value_t *v, uintptr_t data); |
| 611 | 24 |
| 25 static ngx_int_t ngx_http_ssl_add_variables(ngx_conf_t *cf); | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
26 static void *ngx_http_ssl_create_srv_conf(ngx_conf_t *cf); |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
27 static char *ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, |
| 501 | 28 void *parent, void *child); |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
29 |
| 2224 | 30 static char *ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, |
| 31 void *conf); | |
| 973 | 32 static char *ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, |
| 33 void *conf); | |
| 34 | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
35 |
| 547 | 36 static ngx_conf_bitmask_t ngx_http_ssl_protocols[] = { |
| 37 { ngx_string("SSLv2"), NGX_SSL_SSLv2 }, | |
| 38 { ngx_string("SSLv3"), NGX_SSL_SSLv3 }, | |
| 39 { ngx_string("TLSv1"), NGX_SSL_TLSv1 }, | |
|
4400
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
40 { ngx_string("TLSv1.1"), NGX_SSL_TLSv1_1 }, |
|
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
41 { ngx_string("TLSv1.2"), NGX_SSL_TLSv1_2 }, |
| 547 | 42 { ngx_null_string, 0 } |
| 43 }; | |
| 44 | |
| 45 | |
| 2123 | 46 static ngx_conf_enum_t ngx_http_ssl_verify[] = { |
| 47 { ngx_string("off"), 0 }, | |
| 48 { ngx_string("on"), 1 }, | |
| 2994 | 49 { ngx_string("optional"), 2 }, |
| 2123 | 50 { ngx_null_string, 0 } |
| 51 }; | |
| 52 | |
| 53 | |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
54 static ngx_command_t ngx_http_ssl_commands[] = { |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
55 |
|
393
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
392
diff
changeset
|
56 { ngx_string("ssl"), |
| 599 | 57 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, |
| 2224 | 58 ngx_http_ssl_enable, |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
59 NGX_HTTP_SRV_CONF_OFFSET, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
60 offsetof(ngx_http_ssl_srv_conf_t, enable), |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
61 NULL }, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
62 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
63 { ngx_string("ssl_certificate"), |
| 599 | 64 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
65 ngx_conf_set_str_slot, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
66 NGX_HTTP_SRV_CONF_OFFSET, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
67 offsetof(ngx_http_ssl_srv_conf_t, certificate), |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
68 NULL }, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
69 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
70 { ngx_string("ssl_certificate_key"), |
| 599 | 71 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
72 ngx_conf_set_str_slot, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
73 NGX_HTTP_SRV_CONF_OFFSET, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
74 offsetof(ngx_http_ssl_srv_conf_t, certificate_key), |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
75 NULL }, |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
76 |
| 2044 | 77 { ngx_string("ssl_dhparam"), |
| 78 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | |
| 79 ngx_conf_set_str_slot, | |
| 80 NGX_HTTP_SRV_CONF_OFFSET, | |
| 81 offsetof(ngx_http_ssl_srv_conf_t, dhparam), | |
| 82 NULL }, | |
| 83 | |
| 3960 | 84 { ngx_string("ssl_ecdh_curve"), |
| 85 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | |
| 86 ngx_conf_set_str_slot, | |
| 87 NGX_HTTP_SRV_CONF_OFFSET, | |
| 88 offsetof(ngx_http_ssl_srv_conf_t, ecdh_curve), | |
| 89 NULL }, | |
| 90 | |
| 547 | 91 { ngx_string("ssl_protocols"), |
| 563 | 92 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_1MORE, |
| 547 | 93 ngx_conf_set_bitmask_slot, |
| 94 NGX_HTTP_SRV_CONF_OFFSET, | |
| 95 offsetof(ngx_http_ssl_srv_conf_t, protocols), | |
| 96 &ngx_http_ssl_protocols }, | |
| 97 | |
| 479 | 98 { ngx_string("ssl_ciphers"), |
| 563 | 99 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, |
| 479 | 100 ngx_conf_set_str_slot, |
| 101 NGX_HTTP_SRV_CONF_OFFSET, | |
| 102 offsetof(ngx_http_ssl_srv_conf_t, ciphers), | |
| 103 NULL }, | |
| 104 | |
| 647 | 105 { ngx_string("ssl_verify_client"), |
|
4273
e444e8f6538b
Fixed NGX_CONF_TAKE1/NGX_CONF_FLAG misuse.
Sergey Budnevitch <sb@waeme.net>
parents:
4234
diff
changeset
|
106 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, |
| 2123 | 107 ngx_conf_set_enum_slot, |
| 647 | 108 NGX_HTTP_SRV_CONF_OFFSET, |
| 109 offsetof(ngx_http_ssl_srv_conf_t, verify), | |
| 2123 | 110 &ngx_http_ssl_verify }, |
| 647 | 111 |
| 112 { ngx_string("ssl_verify_depth"), | |
| 113 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_1MORE, | |
| 114 ngx_conf_set_num_slot, | |
| 115 NGX_HTTP_SRV_CONF_OFFSET, | |
| 116 offsetof(ngx_http_ssl_srv_conf_t, verify_depth), | |
| 117 NULL }, | |
| 118 | |
| 119 { ngx_string("ssl_client_certificate"), | |
| 120 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | |
| 121 ngx_conf_set_str_slot, | |
| 122 NGX_HTTP_SRV_CONF_OFFSET, | |
| 123 offsetof(ngx_http_ssl_srv_conf_t, client_certificate), | |
| 124 NULL }, | |
| 125 | |
| 547 | 126 { ngx_string("ssl_prefer_server_ciphers"), |
| 127 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, | |
| 128 ngx_conf_set_flag_slot, | |
| 129 NGX_HTTP_SRV_CONF_OFFSET, | |
| 130 offsetof(ngx_http_ssl_srv_conf_t, prefer_server_ciphers), | |
| 131 NULL }, | |
| 132 | |
| 973 | 133 { ngx_string("ssl_session_cache"), |
| 134 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE12, | |
| 135 ngx_http_ssl_session_cache, | |
| 136 NGX_HTTP_SRV_CONF_OFFSET, | |
| 137 0, | |
| 138 NULL }, | |
| 139 | |
| 573 | 140 { ngx_string("ssl_session_timeout"), |
| 141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | |
| 142 ngx_conf_set_sec_slot, | |
| 143 NGX_HTTP_SRV_CONF_OFFSET, | |
| 144 offsetof(ngx_http_ssl_srv_conf_t, session_timeout), | |
| 145 NULL }, | |
| 146 | |
| 2995 | 147 { ngx_string("ssl_crl"), |
| 148 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1, | |
| 149 ngx_conf_set_str_slot, | |
| 150 NGX_HTTP_SRV_CONF_OFFSET, | |
| 151 offsetof(ngx_http_ssl_srv_conf_t, crl), | |
| 152 NULL }, | |
| 153 | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
154 ngx_null_command |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
155 }; |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
156 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
157 |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
158 static ngx_http_module_t ngx_http_ssl_module_ctx = { |
| 611 | 159 ngx_http_ssl_add_variables, /* preconfiguration */ |
| 509 | 160 NULL, /* postconfiguration */ |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
161 |
| 541 | 162 NULL, /* create main configuration */ |
| 163 NULL, /* init main configuration */ | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
164 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
165 ngx_http_ssl_create_srv_conf, /* create server configuration */ |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
166 ngx_http_ssl_merge_srv_conf, /* merge server configuration */ |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
167 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
168 NULL, /* create location configuration */ |
| 485 | 169 NULL /* merge location configuration */ |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
170 }; |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
171 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
172 |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
173 ngx_module_t ngx_http_ssl_module = { |
| 509 | 174 NGX_MODULE_V1, |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
175 &ngx_http_ssl_module_ctx, /* module context */ |
|
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
176 ngx_http_ssl_commands, /* module directives */ |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
177 NGX_HTTP_MODULE, /* module type */ |
| 541 | 178 NULL, /* init master */ |
|
393
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
392
diff
changeset
|
179 NULL, /* init module */ |
| 541 | 180 NULL, /* init process */ |
| 181 NULL, /* init thread */ | |
| 182 NULL, /* exit thread */ | |
| 183 NULL, /* exit process */ | |
| 184 NULL, /* exit master */ | |
| 185 NGX_MODULE_V1_PADDING | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
186 }; |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
187 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
188 |
| 611 | 189 static ngx_http_variable_t ngx_http_ssl_vars[] = { |
| 190 | |
| 671 | 191 { ngx_string("ssl_protocol"), NULL, ngx_http_ssl_static_variable, |
| 1565 | 192 (uintptr_t) ngx_ssl_get_protocol, NGX_HTTP_VAR_CHANGEABLE, 0 }, |
| 611 | 193 |
| 671 | 194 { ngx_string("ssl_cipher"), NULL, ngx_http_ssl_static_variable, |
| 1565 | 195 (uintptr_t) ngx_ssl_get_cipher_name, NGX_HTTP_VAR_CHANGEABLE, 0 }, |
| 611 | 196 |
| 3154 | 197 { ngx_string("ssl_session_id"), NULL, ngx_http_ssl_variable, |
| 198 (uintptr_t) ngx_ssl_get_session_id, NGX_HTTP_VAR_CHANGEABLE, 0 }, | |
| 199 | |
| 2045 | 200 { ngx_string("ssl_client_cert"), NULL, ngx_http_ssl_variable, |
| 201 (uintptr_t) ngx_ssl_get_certificate, NGX_HTTP_VAR_CHANGEABLE, 0 }, | |
| 202 | |
| 2123 | 203 { ngx_string("ssl_client_raw_cert"), NULL, ngx_http_ssl_variable, |
| 204 (uintptr_t) ngx_ssl_get_raw_certificate, | |
| 205 NGX_HTTP_VAR_CHANGEABLE, 0 }, | |
| 206 | |
| 671 | 207 { ngx_string("ssl_client_s_dn"), NULL, ngx_http_ssl_variable, |
| 1565 | 208 (uintptr_t) ngx_ssl_get_subject_dn, NGX_HTTP_VAR_CHANGEABLE, 0 }, |
| 647 | 209 |
| 671 | 210 { ngx_string("ssl_client_i_dn"), NULL, ngx_http_ssl_variable, |
| 1565 | 211 (uintptr_t) ngx_ssl_get_issuer_dn, NGX_HTTP_VAR_CHANGEABLE, 0 }, |
| 671 | 212 |
| 213 { ngx_string("ssl_client_serial"), NULL, ngx_http_ssl_variable, | |
| 1565 | 214 (uintptr_t) ngx_ssl_get_serial_number, NGX_HTTP_VAR_CHANGEABLE, 0 }, |
| 647 | 215 |
| 2994 | 216 { ngx_string("ssl_client_verify"), NULL, ngx_http_ssl_variable, |
| 217 (uintptr_t) ngx_ssl_get_client_verify, NGX_HTTP_VAR_CHANGEABLE, 0 }, | |
| 218 | |
| 637 | 219 { ngx_null_string, NULL, NULL, 0, 0, 0 } |
| 611 | 220 }; |
| 221 | |
| 222 | |
|
974
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
223 static ngx_str_t ngx_http_ssl_sess_id_ctx = ngx_string("HTTP"); |
| 973 | 224 |
| 225 | |
| 226 static ngx_int_t | |
| 671 | 227 ngx_http_ssl_static_variable(ngx_http_request_t *r, |
| 611 | 228 ngx_http_variable_value_t *v, uintptr_t data) |
| 229 { | |
| 671 | 230 ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data; |
| 611 | 231 |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
232 size_t len; |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
233 ngx_str_t s; |
| 611 | 234 |
| 235 if (r->connection->ssl) { | |
| 236 | |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
237 (void) handler(r->connection, NULL, &s); |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
238 |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
239 v->data = s.data; |
| 611 | 240 |
| 671 | 241 for (len = 0; v->data[len]; len++) { /* void */ } |
| 611 | 242 |
| 243 v->len = len; | |
| 244 v->valid = 1; | |
| 1565 | 245 v->no_cacheable = 0; |
| 611 | 246 v->not_found = 0; |
| 247 | |
| 248 return NGX_OK; | |
| 249 } | |
| 250 | |
| 251 v->not_found = 1; | |
| 252 | |
| 253 return NGX_OK; | |
| 254 } | |
| 255 | |
| 256 | |
| 257 static ngx_int_t | |
| 671 | 258 ngx_http_ssl_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, |
| 647 | 259 uintptr_t data) |
| 260 { | |
| 671 | 261 ngx_ssl_variable_handler_pt handler = (ngx_ssl_variable_handler_pt) data; |
| 647 | 262 |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
263 ngx_str_t s; |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
264 |
| 647 | 265 if (r->connection->ssl) { |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
266 |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
267 if (handler(r->connection, r->pool, &s) != NGX_OK) { |
| 647 | 268 return NGX_ERROR; |
| 269 } | |
| 270 | |
|
1310
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
271 v->len = s.len; |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
272 v->data = s.data; |
|
33d6c994a0b2
Sun Studio on sparc uses different bit order
Igor Sysoev <igor@sysoev.ru>
parents:
1219
diff
changeset
|
273 |
| 647 | 274 if (v->len) { |
| 275 v->valid = 1; | |
| 1565 | 276 v->no_cacheable = 0; |
| 647 | 277 v->not_found = 0; |
| 278 | |
| 279 return NGX_OK; | |
| 280 } | |
| 281 } | |
| 282 | |
| 283 v->not_found = 1; | |
| 284 | |
| 285 return NGX_OK; | |
| 286 } | |
| 287 | |
| 288 | |
| 289 static ngx_int_t | |
| 611 | 290 ngx_http_ssl_add_variables(ngx_conf_t *cf) |
| 291 { | |
| 292 ngx_http_variable_t *var, *v; | |
| 293 | |
| 294 for (v = ngx_http_ssl_vars; v->name.len; v++) { | |
| 295 var = ngx_http_add_variable(cf, &v->name, v->flags); | |
| 296 if (var == NULL) { | |
| 297 return NGX_ERROR; | |
| 298 } | |
| 299 | |
| 637 | 300 var->get_handler = v->get_handler; |
| 611 | 301 var->data = v->data; |
| 302 } | |
| 303 | |
| 304 return NGX_OK; | |
| 305 } | |
| 306 | |
| 307 | |
| 501 | 308 static void * |
| 309 ngx_http_ssl_create_srv_conf(ngx_conf_t *cf) | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
310 { |
| 971 | 311 ngx_http_ssl_srv_conf_t *sscf; |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
312 |
| 971 | 313 sscf = ngx_pcalloc(cf->pool, sizeof(ngx_http_ssl_srv_conf_t)); |
| 314 if (sscf == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2716
diff
changeset
|
315 return NULL; |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
316 } |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
317 |
| 479 | 318 /* |
| 319 * set by ngx_pcalloc(): | |
| 320 * | |
| 971 | 321 * sscf->protocols = 0; |
| 2044 | 322 * sscf->certificate = { 0, NULL }; |
| 323 * sscf->certificate_key = { 0, NULL }; | |
| 324 * sscf->dhparam = { 0, NULL }; | |
| 3960 | 325 * sscf->ecdh_curve = { 0, NULL }; |
| 2044 | 326 * sscf->client_certificate = { 0, NULL }; |
| 2995 | 327 * sscf->crl = { 0, NULL }; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3209
diff
changeset
|
328 * sscf->ciphers = { 0, NULL }; |
| 973 | 329 * sscf->shm_zone = NULL; |
| 479 | 330 */ |
| 331 | |
| 971 | 332 sscf->enable = NGX_CONF_UNSET; |
| 2123 | 333 sscf->prefer_server_ciphers = NGX_CONF_UNSET; |
| 2710 | 334 sscf->verify = NGX_CONF_UNSET_UINT; |
| 335 sscf->verify_depth = NGX_CONF_UNSET_UINT; | |
| 973 | 336 sscf->builtin_session_cache = NGX_CONF_UNSET; |
| 337 sscf->session_timeout = NGX_CONF_UNSET; | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
338 |
| 971 | 339 return sscf; |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
340 } |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
341 |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
342 |
| 501 | 343 static char * |
| 344 ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
345 { |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
346 ngx_http_ssl_srv_conf_t *prev = parent; |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
347 ngx_http_ssl_srv_conf_t *conf = child; |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
348 |
| 563 | 349 ngx_pool_cleanup_t *cln; |
| 350 | |
|
4234
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
351 if (conf->enable == NGX_CONF_UNSET) { |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
352 if (prev->enable == NGX_CONF_UNSET) { |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
353 conf->enable = 0; |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
354 |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
355 } else { |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
356 conf->enable = prev->enable; |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
357 conf->file = prev->file; |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
358 conf->line = prev->line; |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
359 } |
|
d5462eab1440
Fixed segfault on configuration testing with ssl (ticket #37).
Maxim Dounin <mdounin@mdounin.ru>
parents:
4153
diff
changeset
|
360 } |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
361 |
| 573 | 362 ngx_conf_merge_value(conf->session_timeout, |
| 363 prev->session_timeout, 300); | |
| 364 | |
| 547 | 365 ngx_conf_merge_value(conf->prefer_server_ciphers, |
| 366 prev->prefer_server_ciphers, 0); | |
| 367 | |
| 368 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, | |
|
4400
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
369 (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1 |
|
a0505851e70c
Added support for TLSv1.1, TLSv1.2 in ssl_protocols directive.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4273
diff
changeset
|
370 |NGX_SSL_TLSv1_1|NGX_SSL_TLSv1_2)); |
| 547 | 371 |
| 2123 | 372 ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); |
| 373 ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); | |
| 647 | 374 |
| 2224 | 375 ngx_conf_merge_str_value(conf->certificate, prev->certificate, ""); |
| 376 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, ""); | |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
377 |
| 2044 | 378 ngx_conf_merge_str_value(conf->dhparam, prev->dhparam, ""); |
| 379 | |
| 647 | 380 ngx_conf_merge_str_value(conf->client_certificate, prev->client_certificate, |
| 381 ""); | |
| 2995 | 382 ngx_conf_merge_str_value(conf->crl, prev->crl, ""); |
| 647 | 383 |
| 3960 | 384 ngx_conf_merge_str_value(conf->ecdh_curve, prev->ecdh_curve, |
| 385 NGX_DEFAULT_ECDH_CURVE); | |
| 386 | |
| 2124 | 387 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFAULT_CIPHERS); |
| 479 | 388 |
| 389 | |
| 547 | 390 conf->ssl.log = cf->log; |
|
386
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
391 |
| 2224 | 392 if (conf->enable) { |
| 393 | |
| 394 if (conf->certificate.len == 0) { | |
| 395 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 396 "no \"ssl_certificate\" is defined for " | |
| 397 "the \"ssl\" directive in %s:%ui", | |
| 398 conf->file, conf->line); | |
| 399 return NGX_CONF_ERROR; | |
| 400 } | |
| 401 | |
| 402 if (conf->certificate_key.len == 0) { | |
| 403 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 404 "no \"ssl_certificate_key\" is defined for " | |
| 405 "the \"ssl\" directive in %s:%ui", | |
| 406 conf->file, conf->line); | |
| 407 return NGX_CONF_ERROR; | |
| 408 } | |
| 409 | |
| 410 } else { | |
| 411 | |
| 412 if (conf->certificate.len == 0) { | |
| 413 return NGX_CONF_OK; | |
| 414 } | |
| 415 | |
| 416 if (conf->certificate_key.len == 0) { | |
| 417 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 418 "no \"ssl_certificate_key\" is defined " | |
| 419 "for certificate \"%V\"", &conf->certificate); | |
| 420 return NGX_CONF_ERROR; | |
| 421 } | |
| 422 } | |
| 423 | |
| 969 | 424 if (ngx_ssl_create(&conf->ssl, conf->protocols, conf) != NGX_OK) { |
|
386
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
425 return NGX_CONF_ERROR; |
|
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
426 } |
|
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
427 |
| 1219 | 428 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME |
| 429 | |
| 430 if (SSL_CTX_set_tlsext_servername_callback(conf->ssl.ctx, | |
| 431 ngx_http_ssl_servername) | |
| 432 == 0) | |
| 433 { | |
|
3140
ba9a8ba4207e
*) issue warning instead of failure: this is too common case
Igor Sysoev <igor@sysoev.ru>
parents:
2996
diff
changeset
|
434 ngx_log_error(NGX_LOG_WARN, cf->log, 0, |
| 3209 | 435 "nginx was built with SNI support, however, now it is linked " |
|
3140
ba9a8ba4207e
*) issue warning instead of failure: this is too common case
Igor Sysoev <igor@sysoev.ru>
parents:
2996
diff
changeset
|
436 "dynamically to an OpenSSL library which has no tlsext support, " |
|
ba9a8ba4207e
*) issue warning instead of failure: this is too common case
Igor Sysoev <igor@sysoev.ru>
parents:
2996
diff
changeset
|
437 "therefore SNI is not available"); |
| 1219 | 438 } |
| 439 | |
| 440 #endif | |
| 441 | |
| 563 | 442 cln = ngx_pool_cleanup_add(cf->pool, 0); |
| 443 if (cln == NULL) { | |
| 509 | 444 return NGX_CONF_ERROR; |
| 445 } | |
| 446 | |
| 563 | 447 cln->handler = ngx_ssl_cleanup_ctx; |
| 448 cln->data = &conf->ssl; | |
| 449 | |
| 450 if (ngx_ssl_certificate(cf, &conf->ssl, &conf->certificate, | |
| 970 | 451 &conf->certificate_key) |
| 452 != NGX_OK) | |
| 529 | 453 { |
|
386
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
454 return NGX_CONF_ERROR; |
|
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
455 } |
|
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
456 |
| 547 | 457 if (SSL_CTX_set_cipher_list(conf->ssl.ctx, |
| 563 | 458 (const char *) conf->ciphers.data) |
| 459 == 0) | |
| 529 | 460 { |
|
395
f8f0f1834266
nginx-0.0.7-2004-07-16-21:11:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
394
diff
changeset
|
461 ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, |
| 547 | 462 "SSL_CTX_set_cipher_list(\"%V\") failed", |
| 463 &conf->ciphers); | |
| 464 } | |
| 465 | |
| 647 | 466 if (conf->verify) { |
| 2123 | 467 |
| 468 if (conf->client_certificate.len == 0) { | |
| 469 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
| 470 "no ssl_client_certificate for ssl_client_verify"); | |
| 471 return NGX_CONF_ERROR; | |
| 472 } | |
| 473 | |
| 671 | 474 if (ngx_ssl_client_certificate(cf, &conf->ssl, |
| 970 | 475 &conf->client_certificate, |
| 476 conf->verify_depth) | |
| 671 | 477 != NGX_OK) |
| 478 { | |
| 479 return NGX_CONF_ERROR; | |
| 647 | 480 } |
| 2995 | 481 |
| 482 if (ngx_ssl_crl(cf, &conf->ssl, &conf->crl) != NGX_OK) { | |
| 483 return NGX_CONF_ERROR; | |
| 484 } | |
| 647 | 485 } |
| 486 | |
| 547 | 487 if (conf->prefer_server_ciphers) { |
| 488 SSL_CTX_set_options(conf->ssl.ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); | |
| 489 } | |
| 490 | |
| 491 /* a temporary 512-bit RSA key is required for export versions of MSIE */ | |
|
3959
b1f48fa31e6c
MSIE export versions are rare now, so RSA 512 key is generated on demand
Igor Sysoev <igor@sysoev.ru>
parents:
3938
diff
changeset
|
492 SSL_CTX_set_tmp_rsa_callback(conf->ssl.ctx, ngx_ssl_rsa512_key_callback); |
|
386
fa72605e7089
nginx-0.0.7-2004-07-12-01:03:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
385
diff
changeset
|
493 |
| 2044 | 494 if (ngx_ssl_dhparam(cf, &conf->ssl, &conf->dhparam) != NGX_OK) { |
| 495 return NGX_CONF_ERROR; | |
| 496 } | |
| 497 | |
| 3960 | 498 if (ngx_ssl_ecdh_curve(cf, &conf->ssl, &conf->ecdh_curve) != NGX_OK) { |
| 499 return NGX_CONF_ERROR; | |
| 500 } | |
| 501 | |
| 973 | 502 ngx_conf_merge_value(conf->builtin_session_cache, |
| 2032 | 503 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE); |
| 973 | 504 |
| 505 if (conf->shm_zone == NULL) { | |
| 506 conf->shm_zone = prev->shm_zone; | |
| 507 } | |
| 508 | |
|
974
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
509 if (ngx_ssl_session_cache(&conf->ssl, &ngx_http_ssl_sess_id_ctx, |
|
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
510 conf->builtin_session_cache, |
|
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
511 conf->shm_zone, conf->session_timeout) |
|
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
512 != NGX_OK) |
| 973 | 513 { |
|
974
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
514 return NGX_CONF_ERROR; |
| 973 | 515 } |
| 573 | 516 |
|
383
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
517 return NGX_CONF_OK; |
|
c05876036128
nginx-0.0.7-2004-07-08-19:17:47 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
518 } |
| 563 | 519 |
| 520 | |
| 973 | 521 static char * |
| 2224 | 522 ngx_http_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 523 { | |
| 524 ngx_http_ssl_srv_conf_t *sscf = conf; | |
| 525 | |
| 526 char *rv; | |
| 527 | |
| 528 rv = ngx_conf_set_flag_slot(cf, cmd, conf); | |
| 529 | |
| 530 if (rv != NGX_CONF_OK) { | |
| 531 return rv; | |
| 532 } | |
| 533 | |
| 534 sscf->file = cf->conf_file->file.name.data; | |
| 535 sscf->line = cf->conf_file->line; | |
| 536 | |
| 537 return NGX_CONF_OK; | |
| 538 } | |
| 539 | |
| 540 | |
| 541 static char * | |
| 973 | 542 ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 543 { | |
| 544 ngx_http_ssl_srv_conf_t *sscf = conf; | |
| 545 | |
| 546 size_t len; | |
| 547 ngx_str_t *value, name, size; | |
| 548 ngx_int_t n; | |
| 549 ngx_uint_t i, j; | |
| 550 | |
| 551 value = cf->args->elts; | |
| 552 | |
| 553 for (i = 1; i < cf->args->nelts; i++) { | |
| 554 | |
| 1778 | 555 if (ngx_strcmp(value[i].data, "off") == 0) { |
| 556 sscf->builtin_session_cache = NGX_SSL_NO_SCACHE; | |
| 557 continue; | |
| 558 } | |
| 559 | |
| 2032 | 560 if (ngx_strcmp(value[i].data, "none") == 0) { |
| 561 sscf->builtin_session_cache = NGX_SSL_NONE_SCACHE; | |
| 562 continue; | |
| 563 } | |
| 564 | |
| 973 | 565 if (ngx_strcmp(value[i].data, "builtin") == 0) { |
|
974
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
566 sscf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; |
| 973 | 567 continue; |
| 568 } | |
| 569 | |
| 570 if (value[i].len > sizeof("builtin:") - 1 | |
| 571 && ngx_strncmp(value[i].data, "builtin:", sizeof("builtin:") - 1) | |
| 572 == 0) | |
| 573 { | |
| 574 n = ngx_atoi(value[i].data + sizeof("builtin:") - 1, | |
| 575 value[i].len - (sizeof("builtin:") - 1)); | |
| 576 | |
| 577 if (n == NGX_ERROR) { | |
| 578 goto invalid; | |
| 579 } | |
| 580 | |
| 581 sscf->builtin_session_cache = n; | |
| 582 | |
| 583 continue; | |
| 584 } | |
| 585 | |
| 586 if (value[i].len > sizeof("shared:") - 1 | |
| 587 && ngx_strncmp(value[i].data, "shared:", sizeof("shared:") - 1) | |
| 588 == 0) | |
| 589 { | |
| 590 len = 0; | |
| 591 | |
| 592 for (j = sizeof("shared:") - 1; j < value[i].len; j++) { | |
| 593 if (value[i].data[j] == ':') { | |
|
2716
d5896f6608e8
move zone name from ngx_shm_zone_t to ngx_shm_t to use Win32 shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
2710
diff
changeset
|
594 value[i].data[j] = '\0'; |
| 973 | 595 break; |
| 596 } | |
| 597 | |
| 598 len++; | |
| 599 } | |
| 600 | |
| 601 if (len == 0) { | |
| 602 goto invalid; | |
| 603 } | |
| 604 | |
| 605 name.len = len; | |
| 606 name.data = value[i].data + sizeof("shared:") - 1; | |
| 607 | |
| 608 size.len = value[i].len - j - 1; | |
| 609 size.data = name.data + len + 1; | |
| 610 | |
| 611 n = ngx_parse_size(&size); | |
| 612 | |
| 613 if (n == NGX_ERROR) { | |
| 614 goto invalid; | |
| 615 } | |
| 616 | |
| 617 if (n < (ngx_int_t) (8 * ngx_pagesize)) { | |
| 618 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
|
974
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
619 "session cache \"%V\" is too small", |
| 973 | 620 &value[i]); |
| 621 | |
| 622 return NGX_CONF_ERROR; | |
| 623 } | |
| 624 | |
| 625 sscf->shm_zone = ngx_shared_memory_add(cf, &name, n, | |
| 626 &ngx_http_ssl_module); | |
| 627 if (sscf->shm_zone == NULL) { | |
| 628 return NGX_CONF_ERROR; | |
| 629 } | |
| 630 | |
|
4153
7de74ed694c8
Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
Maxim Dounin <mdounin@mdounin.ru>
parents:
3992
diff
changeset
|
631 sscf->shm_zone->init = ngx_ssl_session_cache_init; |
|
7de74ed694c8
Fix for "ssl_session_cache builtin" (broken since 1.1.1, r3993).
Maxim Dounin <mdounin@mdounin.ru>
parents:
3992
diff
changeset
|
632 |
| 973 | 633 continue; |
| 634 } | |
| 635 | |
| 636 goto invalid; | |
| 637 } | |
| 638 | |
| 639 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) { | |
|
974
8dfb3aa75de2
move the session cache callbacks to the ngx_openssl_module
Igor Sysoev <igor@sysoev.ru>
parents:
973
diff
changeset
|
640 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; |
| 973 | 641 } |
| 642 | |
| 643 return NGX_CONF_OK; | |
| 644 | |
| 645 invalid: | |
| 646 | |
| 647 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 648 "invalid session cache \"%V\"", &value[i]); | |
| 649 | |
| 650 return NGX_CONF_ERROR; | |
| 651 } |