diff options
Diffstat (limited to 'src/daemon/https/tls/ext_server_name.c')
-rw-r--r-- | src/daemon/https/tls/ext_server_name.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/daemon/https/tls/ext_server_name.c b/src/daemon/https/tls/ext_server_name.c index 9878fe62..1e3cab02 100644 --- a/src/daemon/https/tls/ext_server_name.c +++ b/src/daemon/https/tls/ext_server_name.c | |||
@@ -104,12 +104,12 @@ MHD_gtls_server_name_recv_params (MHD_gtls_session_t session, | |||
104 | case 0: /* NAME_DNS */ | 104 | case 0: /* NAME_DNS */ |
105 | if (len <= MAX_SERVER_NAME_SIZE) | 105 | if (len <= MAX_SERVER_NAME_SIZE) |
106 | { | 106 | { |
107 | memcpy (session->security_parameters.extensions. | 107 | memcpy (session->security_parameters. |
108 | server_names[i].name, p, len); | 108 | extensions.server_names[i].name, p, len); |
109 | session->security_parameters.extensions. | 109 | session->security_parameters.extensions.server_names[i]. |
110 | server_names[i].name_length = len; | 110 | name_length = len; |
111 | session->security_parameters.extensions. | 111 | session->security_parameters.extensions.server_names[i]. |
112 | server_names[i].type = GNUTLS_NAME_DNS; | 112 | type = GNUTLS_NAME_DNS; |
113 | break; | 113 | break; |
114 | } | 114 | } |
115 | } | 115 | } |
@@ -150,8 +150,8 @@ MHD_gtls_server_name_send_params (MHD_gtls_session_t session, | |||
150 | /* count the total size | 150 | /* count the total size |
151 | */ | 151 | */ |
152 | len = | 152 | len = |
153 | session->security_parameters.extensions.server_names[i]. | 153 | session->security_parameters.extensions. |
154 | name_length; | 154 | server_names[i].name_length; |
155 | 155 | ||
156 | /* uint8_t + uint16_t + size | 156 | /* uint8_t + uint16_t + size |
157 | */ | 157 | */ |
@@ -170,14 +170,14 @@ MHD_gtls_server_name_send_params (MHD_gtls_session_t session, | |||
170 | i < session->security_parameters.extensions.server_names_size; i++) | 170 | i < session->security_parameters.extensions.server_names_size; i++) |
171 | { | 171 | { |
172 | 172 | ||
173 | switch (session->security_parameters.extensions. | 173 | switch (session->security_parameters.extensions.server_names[i]. |
174 | server_names[i].type) | 174 | type) |
175 | { | 175 | { |
176 | case GNUTLS_NAME_DNS: | 176 | case GNUTLS_NAME_DNS: |
177 | 177 | ||
178 | len = | 178 | len = |
179 | session->security_parameters.extensions. | 179 | session->security_parameters.extensions.server_names[i]. |
180 | server_names[i].name_length; | 180 | name_length; |
181 | if (len == 0) | 181 | if (len == 0) |
182 | break; | 182 | break; |
183 | 183 | ||
@@ -195,8 +195,8 @@ MHD_gtls_server_name_send_params (MHD_gtls_session_t session, | |||
195 | p += 2; | 195 | p += 2; |
196 | 196 | ||
197 | memcpy (p, | 197 | memcpy (p, |
198 | session->security_parameters.extensions. | 198 | session->security_parameters.extensions.server_names[0]. |
199 | server_names[0].name, len); | 199 | name, len); |
200 | p += len; | 200 | p += len; |
201 | break; | 201 | break; |
202 | default: | 202 | default: |
@@ -234,8 +234,8 @@ MHD_gtls_server_name_send_params (MHD_gtls_session_t session, | |||
234 | **/ | 234 | **/ |
235 | int | 235 | int |
236 | MHD__gnutls_server_name_get (MHD_gtls_session_t session, void *data, | 236 | MHD__gnutls_server_name_get (MHD_gtls_session_t session, void *data, |
237 | size_t * data_length, | 237 | size_t * data_length, |
238 | unsigned int *type, unsigned int indx) | 238 | unsigned int *type, unsigned int indx) |
239 | { | 239 | { |
240 | char *_data = data; | 240 | char *_data = data; |
241 | #if MHD_DEBUG_TLS | 241 | #if MHD_DEBUG_TLS |
@@ -256,8 +256,8 @@ MHD__gnutls_server_name_get (MHD_gtls_session_t session, void *data, | |||
256 | session->security_parameters.extensions.server_names[indx].name_length) | 256 | session->security_parameters.extensions.server_names[indx].name_length) |
257 | { | 257 | { |
258 | *data_length = | 258 | *data_length = |
259 | session->security_parameters.extensions.server_names[indx]. | 259 | session->security_parameters.extensions. |
260 | name_length; | 260 | server_names[indx].name_length; |
261 | memcpy (data, | 261 | memcpy (data, |
262 | session->security_parameters.extensions.server_names[indx].name, | 262 | session->security_parameters.extensions.server_names[indx].name, |
263 | *data_length); | 263 | *data_length); |
@@ -269,8 +269,8 @@ MHD__gnutls_server_name_get (MHD_gtls_session_t session, void *data, | |||
269 | else | 269 | else |
270 | { | 270 | { |
271 | *data_length = | 271 | *data_length = |
272 | session->security_parameters.extensions.server_names[indx]. | 272 | session->security_parameters.extensions. |
273 | name_length; | 273 | server_names[indx].name_length; |
274 | return GNUTLS_E_SHORT_MEMORY_BUFFER; | 274 | return GNUTLS_E_SHORT_MEMORY_BUFFER; |
275 | } | 275 | } |
276 | 276 | ||
@@ -296,8 +296,8 @@ MHD__gnutls_server_name_get (MHD_gtls_session_t session, void *data, | |||
296 | **/ | 296 | **/ |
297 | int | 297 | int |
298 | MHD__gnutls_server_name_set (MHD_gtls_session_t session, | 298 | MHD__gnutls_server_name_set (MHD_gtls_session_t session, |
299 | MHD_gnutls_server_name_type_t type, | 299 | MHD_gnutls_server_name_type_t type, |
300 | const void *name, size_t name_length) | 300 | const void *name, size_t name_length) |
301 | { | 301 | { |
302 | int server_names; | 302 | int server_names; |
303 | 303 | ||
@@ -318,8 +318,8 @@ MHD__gnutls_server_name_set (MHD_gtls_session_t session, | |||
318 | 318 | ||
319 | session->security_parameters.extensions.server_names[server_names - | 319 | session->security_parameters.extensions.server_names[server_names - |
320 | 1].type = type; | 320 | 1].type = type; |
321 | memcpy (session->security_parameters.extensions. | 321 | memcpy (session->security_parameters. |
322 | server_names[server_names - 1].name, name, name_length); | 322 | extensions.server_names[server_names - 1].name, name, name_length); |
323 | session->security_parameters.extensions.server_names[server_names - | 323 | session->security_parameters.extensions.server_names[server_names - |
324 | 1].name_length = | 324 | 1].name_length = |
325 | name_length; | 325 | name_length; |