diff options
Diffstat (limited to 'src/daemon/https/tls/gnutls_priority.c')
-rw-r--r-- | src/daemon/https/tls/gnutls_priority.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c index 82725899..f871a1cf 100644 --- a/src/daemon/https/tls/gnutls_priority.c +++ b/src/daemon/https/tls/gnutls_priority.c | |||
@@ -147,7 +147,8 @@ MHD_gnutls_mac_set_priority (mhd_gtls_session_t session, const int *list) | |||
147 | * | 147 | * |
148 | **/ | 148 | **/ |
149 | int | 149 | int |
150 | MHD_gnutls_compression_set_priority (mhd_gtls_session_t session, const int *list) | 150 | MHD_gnutls_compression_set_priority (mhd_gtls_session_t session, |
151 | const int *list) | ||
151 | { | 152 | { |
152 | return _set_priority (&session->internals.priorities.compression, list); | 153 | return _set_priority (&session->internals.priorities.compression, list); |
153 | } | 154 | } |
@@ -197,7 +198,7 @@ MHD_gnutls_protocol_set_priority (mhd_gtls_session_t session, const int *list) | |||
197 | **/ | 198 | **/ |
198 | int | 199 | int |
199 | MHD_gnutls_certificate_type_set_priority (mhd_gtls_session_t session, | 200 | MHD_gnutls_certificate_type_set_priority (mhd_gtls_session_t session, |
200 | const int *list) | 201 | const int *list) |
201 | { | 202 | { |
202 | #if ENABLE_OPENPGP | 203 | #if ENABLE_OPENPGP |
203 | return _set_priority (&session->internals.priorities.cert_type, list); | 204 | return _set_priority (&session->internals.priorities.cert_type, list); |
@@ -249,7 +250,8 @@ typedef void (rmadd_func) (mhd_gtls_priority_st * priority_list, int alg); | |||
249 | * | 250 | * |
250 | **/ | 251 | **/ |
251 | int | 252 | int |
252 | MHD_gnutls_priority_set (mhd_gtls_session_t session, gnutls_priority_t priority) | 253 | MHD_gnutls_priority_set (mhd_gtls_session_t session, |
254 | gnutls_priority_t priority) | ||
253 | { | 255 | { |
254 | if (priority == NULL) | 256 | if (priority == NULL) |
255 | { | 257 | { |
@@ -330,7 +332,7 @@ MHD_gnutls_priority_set (mhd_gtls_session_t session, gnutls_priority_t priority) | |||
330 | **/ | 332 | **/ |
331 | int | 333 | int |
332 | MHD_tls_set_default_priority (gnutls_priority_t * priority_cache, | 334 | MHD_tls_set_default_priority (gnutls_priority_t * priority_cache, |
333 | const char *priorities, const char **err_pos) | 335 | const char *priorities, const char **err_pos) |
334 | { | 336 | { |
335 | *priority_cache = gnutls_calloc (1, sizeof (struct MHD_gtls_priority_st)); | 337 | *priority_cache = gnutls_calloc (1, sizeof (struct MHD_gtls_priority_st)); |
336 | if (*priority_cache == NULL) | 338 | if (*priority_cache == NULL) |
@@ -341,7 +343,8 @@ MHD_tls_set_default_priority (gnutls_priority_t * priority_cache, | |||
341 | 343 | ||
342 | /* set mode to "SECURE256" */ | 344 | /* set mode to "SECURE256" */ |
343 | _set_priority (&(*priority_cache)->protocol, mhd_gtls_protocol_priority); | 345 | _set_priority (&(*priority_cache)->protocol, mhd_gtls_protocol_priority); |
344 | _set_priority (&(*priority_cache)->cipher, mhd_gtls_cipher_priority_secure256); | 346 | _set_priority (&(*priority_cache)->cipher, |
347 | mhd_gtls_cipher_priority_secure256); | ||
345 | _set_priority (&(*priority_cache)->kx, mhd_gtls_kx_priority_secure); | 348 | _set_priority (&(*priority_cache)->kx, mhd_gtls_kx_priority_secure); |
346 | _set_priority (&(*priority_cache)->mac, mhd_gtls_mac_priority_secure); | 349 | _set_priority (&(*priority_cache)->mac, mhd_gtls_mac_priority_secure); |
347 | _set_priority (&(*priority_cache)->cert_type, mhd_gtls_cert_type_priority); | 350 | _set_priority (&(*priority_cache)->cert_type, mhd_gtls_cert_type_priority); |
@@ -380,7 +383,7 @@ MHD_gnutls_priority_deinit (gnutls_priority_t priority_cache) | |||
380 | **/ | 383 | **/ |
381 | int | 384 | int |
382 | MHD_gnutls_priority_set_direct (mhd_gtls_session_t session, | 385 | MHD_gnutls_priority_set_direct (mhd_gtls_session_t session, |
383 | const char *priorities, const char **err_pos) | 386 | const char *priorities, const char **err_pos) |
384 | { | 387 | { |
385 | gnutls_priority_t prio; | 388 | gnutls_priority_t prio; |
386 | int ret; | 389 | int ret; |