aboutsummaryrefslogtreecommitdiff
path: root/src/daemon/https/tls/gnutls_global.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/daemon/https/tls/gnutls_global.c')
-rw-r--r--src/daemon/https/tls/gnutls_global.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/daemon/https/tls/gnutls_global.c b/src/daemon/https/tls/gnutls_global.c
index 781d12fa..635b01eb 100644
--- a/src/daemon/https/tls/gnutls_global.c
+++ b/src/daemon/https/tls/gnutls_global.c
@@ -51,7 +51,7 @@ extern const ASN1_ARRAY_TYPE MHD_gnutlsMHD__asn1_tab[];
51extern const ASN1_ARRAY_TYPE MHD_pkix_asn1_tab[]; 51extern const ASN1_ARRAY_TYPE MHD_pkix_asn1_tab[];
52 52
53LOG_FUNC MHD__gnutls_log_func; 53LOG_FUNC MHD__gnutls_log_func;
54int MHD__gnutls_log_level = 0; /* default log level */ 54int MHD__gnutls_log_level = 0; /* default log level */
55 55
56ASN1_TYPE MHD__gnutls_pkix1_asn; 56ASN1_TYPE MHD__gnutls_pkix1_asn;
57ASN1_TYPE MHD__gnutlsMHD__gnutls_asn; 57ASN1_TYPE MHD__gnutlsMHD__gnutls_asn;
@@ -148,7 +148,7 @@ MHD_gtls_global_set_mem_functions (MHD_gnutls_alloc_function alloc_func,
148#ifdef DEBUG 148#ifdef DEBUG
149static void 149static void
150MHD__gnutls_gcry_log_handler (void *dummy, int level, 150MHD__gnutls_gcry_log_handler (void *dummy, int level,
151 const char *fmt, va_list list) 151 const char *fmt, va_list list)
152{ 152{
153 MHD_gtls_log (level, fmt, list); 153 MHD_gtls_log (level, fmt, list);
154} 154}
@@ -213,7 +213,7 @@ MHD__gnutls_global_init (void)
213 if (data.wVersion < requested) 213 if (data.wVersion < requested)
214 { 214 {
215 MHD__gnutls_debug_log ("WSAStartup version check failed (%d < %d).\n", 215 MHD__gnutls_debug_log ("WSAStartup version check failed (%d < %d).\n",
216 data.wVersion, requested); 216 data.wVersion, requested);
217 WSACleanup (); 217 WSACleanup ();
218 return GNUTLS_E_LIBRARY_VERSION_MISMATCH; 218 return GNUTLS_E_LIBRARY_VERSION_MISMATCH;
219 } 219 }
@@ -245,9 +245,10 @@ MHD__gnutls_global_init (void)
245 } 245 }
246 246
247 /* for gcrypt in order to be able to allocate memory */ 247 /* for gcrypt in order to be able to allocate memory */
248 gcry_set_allocation_handler (MHD_gnutls_malloc, MHD_gnutls_secure_malloc, 248 gcry_set_allocation_handler (MHD_gnutls_malloc,
249 MHD__gnutls_is_secure_memory, MHD_gnutls_realloc, 249 MHD_gnutls_secure_malloc,
250 MHD_gnutls_free); 250 MHD__gnutls_is_secure_memory,
251 MHD_gnutls_realloc, MHD_gnutls_free);
251 252
252 /* gcry_control (GCRYCTL_DISABLE_INTERNAL_LOCKING, NULL, 0); */ 253 /* gcry_control (GCRYCTL_DISABLE_INTERNAL_LOCKING, NULL, 0); */
253 254
@@ -276,14 +277,17 @@ MHD__gnutls_global_init (void)
276 * This should not deal with files in the final 277 * This should not deal with files in the final
277 * version. 278 * version.
278 */ 279 */
279 res = MHD__asn1_array2tree (MHD_pkix_asn1_tab, &MHD__gnutls_pkix1_asn, NULL); 280 res =
281 MHD__asn1_array2tree (MHD_pkix_asn1_tab, &MHD__gnutls_pkix1_asn, NULL);
280 if (res != ASN1_SUCCESS) 282 if (res != ASN1_SUCCESS)
281 { 283 {
282 result = MHD_gtls_asn2err (res); 284 result = MHD_gtls_asn2err (res);
283 return result; 285 return result;
284 } 286 }
285 287
286 res = MHD__asn1_array2tree (MHD_gnutlsMHD__asn1_tab, &MHD__gnutlsMHD__gnutls_asn, NULL); 288 res =
289 MHD__asn1_array2tree (MHD_gnutlsMHD__asn1_tab,
290 &MHD__gnutlsMHD__gnutls_asn, NULL);
287 if (res != ASN1_SUCCESS) 291 if (res != ASN1_SUCCESS)
288 { 292 {
289 MHD__asn1_delete_structure (&MHD__gnutls_pkix1_asn); 293 MHD__asn1_delete_structure (&MHD__gnutls_pkix1_asn);
@@ -341,7 +345,7 @@ MHD__gnutls_global_deinit (void)
341 **/ 345 **/
342void 346void
343MHD__gnutls_transport_set_pull_function (MHD_gtls_session_t session, 347MHD__gnutls_transport_set_pull_function (MHD_gtls_session_t session,
344 MHD_gtls_pull_func pull_func) 348 MHD_gtls_pull_func pull_func)
345{ 349{
346 session->internals.MHD__gnutls_pull_func = pull_func; 350 session->internals.MHD__gnutls_pull_func = pull_func;
347} 351}
@@ -362,7 +366,7 @@ MHD__gnutls_transport_set_pull_function (MHD_gtls_session_t session,
362 **/ 366 **/
363void 367void
364MHD__gnutls_transport_set_push_function (MHD_gtls_session_t session, 368MHD__gnutls_transport_set_push_function (MHD_gtls_session_t session,
365 MHD_gtls_push_func push_func) 369 MHD_gtls_push_func push_func)
366{ 370{
367 session->internals.MHD__gnutls_push_func = push_func; 371 session->internals.MHD__gnutls_push_func = push_func;
368} 372}