diff options
Diffstat (limited to 'src/daemon/https/tls/gnutls_priority.c')
-rw-r--r-- | src/daemon/https/tls/gnutls_priority.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/daemon/https/tls/gnutls_priority.c b/src/daemon/https/tls/gnutls_priority.c index 06398e83..62bf3489 100644 --- a/src/daemon/https/tls/gnutls_priority.c +++ b/src/daemon/https/tls/gnutls_priority.c | |||
@@ -71,11 +71,10 @@ _set_priority (MHD_gtls_priority_st * st, const int *list) | |||
71 | { | 71 | { |
72 | int num = 0; | 72 | int num = 0; |
73 | 73 | ||
74 | while ( (list[num] != 0) && | 74 | while ((list[num] != 0) && (num < MAX_ALGOS)) |
75 | (num < MAX_ALGOS) ) | ||
76 | num++; | 75 | num++; |
77 | st->num_algorithms = num; | 76 | st->num_algorithms = num; |
78 | memcpy(st->priority, list, num * sizeof(int)); | 77 | memcpy (st->priority, list, num * sizeof (int)); |
79 | return 0; | 78 | return 0; |
80 | } | 79 | } |
81 | 80 | ||
@@ -142,7 +141,7 @@ MHD__gnutls_mac_set_priority (MHD_gtls_session_t session, const int *list) | |||
142 | **/ | 141 | **/ |
143 | int | 142 | int |
144 | MHD__gnutls_compression_set_priority (MHD_gtls_session_t session, | 143 | MHD__gnutls_compression_set_priority (MHD_gtls_session_t session, |
145 | const int *list) | 144 | const int *list) |
146 | { | 145 | { |
147 | return _set_priority (&session->internals.priorities.compression, list); | 146 | return _set_priority (&session->internals.priorities.compression, list); |
148 | } | 147 | } |
@@ -160,7 +159,8 @@ MHD__gnutls_compression_set_priority (MHD_gtls_session_t session, | |||
160 | * | 159 | * |
161 | **/ | 160 | **/ |
162 | int | 161 | int |
163 | MHD__gnutls_protocol_set_priority (MHD_gtls_session_t session, const int *list) | 162 | MHD__gnutls_protocol_set_priority (MHD_gtls_session_t session, |
163 | const int *list) | ||
164 | { | 164 | { |
165 | int ret; | 165 | int ret; |
166 | 166 | ||
@@ -190,7 +190,7 @@ MHD__gnutls_protocol_set_priority (MHD_gtls_session_t session, const int *list) | |||
190 | **/ | 190 | **/ |
191 | int | 191 | int |
192 | MHD__gnutls_certificate_type_set_priority (MHD_gtls_session_t session, | 192 | MHD__gnutls_certificate_type_set_priority (MHD_gtls_session_t session, |
193 | const int *list) | 193 | const int *list) |
194 | { | 194 | { |
195 | #if ENABLE_OPENPGP | 195 | #if ENABLE_OPENPGP |
196 | return _set_priority (&session->internals.priorities.cert_type, list); | 196 | return _set_priority (&session->internals.priorities.cert_type, list); |
@@ -243,7 +243,7 @@ typedef void (rmadd_func) (MHD_gtls_priority_st * priority_list, int alg); | |||
243 | **/ | 243 | **/ |
244 | int | 244 | int |
245 | MHD__gnutls_priority_set (MHD_gtls_session_t session, | 245 | MHD__gnutls_priority_set (MHD_gtls_session_t session, |
246 | MHD_gnutls_priority_t priority) | 246 | MHD_gnutls_priority_t priority) |
247 | { | 247 | { |
248 | if (priority == NULL) | 248 | if (priority == NULL) |
249 | { | 249 | { |
@@ -326,7 +326,8 @@ int | |||
326 | MHD_tls_set_default_priority (MHD_gnutls_priority_t * priority_cache, | 326 | MHD_tls_set_default_priority (MHD_gnutls_priority_t * priority_cache, |
327 | const char *priorities, const char **err_pos) | 327 | const char *priorities, const char **err_pos) |
328 | { | 328 | { |
329 | *priority_cache = MHD_gnutls_calloc (1, sizeof (struct MHD_gtls_priority_st)); | 329 | *priority_cache = |
330 | MHD_gnutls_calloc (1, sizeof (struct MHD_gtls_priority_st)); | ||
330 | if (*priority_cache == NULL) | 331 | if (*priority_cache == NULL) |
331 | { | 332 | { |
332 | MHD_gnutls_assert (); | 333 | MHD_gnutls_assert (); |
@@ -375,7 +376,7 @@ MHD__gnutls_priority_deinit (MHD_gnutls_priority_t priority_cache) | |||
375 | **/ | 376 | **/ |
376 | int | 377 | int |
377 | MHD__gnutls_priority_set_direct (MHD_gtls_session_t session, | 378 | MHD__gnutls_priority_set_direct (MHD_gtls_session_t session, |
378 | const char *priorities, const char **err_pos) | 379 | const char *priorities, const char **err_pos) |
379 | { | 380 | { |
380 | MHD_gnutls_priority_t prio; | 381 | MHD_gnutls_priority_t prio; |
381 | int ret; | 382 | int ret; |