summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/userpref.h13
-rw-r--r--src/utils.h10
2 files changed, 13 insertions, 10 deletions
diff --git a/src/userpref.h b/src/userpref.h
index fcb8b62..3540468 100644
--- a/src/userpref.h
+++ b/src/userpref.h
@@ -23,6 +23,7 @@
23#define USERPREF_H 23#define USERPREF_H
24 24
25#include <gnutls/gnutls.h> 25#include <gnutls/gnutls.h>
26#include <glib.h>
26 27
27#define USERPREF_E_SUCCESS 0 28#define USERPREF_E_SUCCESS 0
28#define USERPREF_E_INVALID_ARG -1 29#define USERPREF_E_INVALID_ARG -1
@@ -33,11 +34,11 @@
33 34
34typedef int16_t userpref_error_t; 35typedef int16_t userpref_error_t;
35 36
36userpref_error_t userpref_get_keys_and_certs(gnutls_x509_privkey_t root_privkey, gnutls_x509_crt_t root_crt, gnutls_x509_privkey_t host_privkey, gnutls_x509_crt_t host_crt); 37G_GNUC_INTERNAL userpref_error_t userpref_get_keys_and_certs(gnutls_x509_privkey_t root_privkey, gnutls_x509_crt_t root_crt, gnutls_x509_privkey_t host_privkey, gnutls_x509_crt_t host_crt);
37userpref_error_t userpref_set_keys_and_certs(gnutls_datum_t * root_key, gnutls_datum_t * root_cert, gnutls_datum_t * host_key, gnutls_datum_t * host_cert); 38G_GNUC_INTERNAL userpref_error_t userpref_set_keys_and_certs(gnutls_datum_t * root_key, gnutls_datum_t * root_cert, gnutls_datum_t * host_key, gnutls_datum_t * host_cert);
38userpref_error_t userpref_get_certs_as_pem(gnutls_datum_t *pem_root_cert, gnutls_datum_t *pem_host_cert); 39G_GNUC_INTERNAL userpref_error_t userpref_get_certs_as_pem(gnutls_datum_t *pem_root_cert, gnutls_datum_t *pem_host_cert);
39userpref_error_t userpref_set_device_public_key(const char *uuid, gnutls_datum_t public_key); 40G_GNUC_INTERNAL userpref_error_t userpref_set_device_public_key(const char *uuid, gnutls_datum_t public_key);
40int userpref_has_device_public_key(const char *uuid); 41G_GNUC_INTERNAL int userpref_has_device_public_key(const char *uuid);
41void userpref_get_host_id(char **host_id); 42G_GNUC_INTERNAL void userpref_get_host_id(char **host_id);
42 43
43#endif 44#endif
diff --git a/src/utils.h b/src/utils.h
index 430e812..c99730a 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -22,10 +22,12 @@
22#ifndef UTILS_H 22#ifndef UTILS_H
23#define UTILS_H 23#define UTILS_H
24 24
25inline void log_debug_msg(const char *format, ...); 25#include <glib.h>
26inline void log_dbg_msg(uint16_t id, const char *format, ...);
27 26
28inline void log_debug_buffer(const char *data, const int length); 27G_GNUC_INTERNAL inline void log_debug_msg(const char *format, ...);
29inline void dump_debug_buffer(const char *file, const char *data, const int length); 28G_GNUC_INTERNAL inline void log_dbg_msg(uint16_t id, const char *format, ...);
29
30G_GNUC_INTERNAL inline void log_debug_buffer(const char *data, const int length);
31G_GNUC_INTERNAL inline void dump_debug_buffer(const char *file, const char *data, const int length);
30 32
31#endif 33#endif