libqaeda

commit c8b32f6b6c904e81acc469aaf1a07bb0c61f508c
parent 45b14652b85df87df952311cd324b37ffc67d094
Author: lash <dev@holbrook.no>
Date:   Fri, 28 Mar 2025 12:05:35 +0000

Change debug setup, log private key load line

Diffstat:
M
src/crypto/gcrypt.c
 | 
5
+++--
M
src/debug.c
 | 
10
+++++-----
M
src/debug.h
 | 
12
+++++++-----
M
src/test/test_debug.c
 | 
9
+++++----

4 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/crypto/gcrypt.c b/src/crypto/gcrypt.c
@@ -82,7 +82,7 @@ int lq_crypto_init(const char *base) {
 		}
 	}
 	gpg_version = v;
-	debug_dbg_x("gpg", "using gpg", 1, MORGEL_TYP_STR, 0, "version", gpg_version);
+	debug_x(LLOG_DEBUG, "gpg", "using gpg", 1, MORGEL_TYP_STR, 0, "version", gpg_version);
 
 	gpg_passphrase_digest_len = gcry_md_get_algo_dlen(GCRY_MD_SHA256);
 	gpg_cfg_idx_dir = lq_config_register(LQ_TYP_STR, "CRYPTODIR");
@@ -441,6 +441,7 @@ static int key_from_file(gcry_sexp_t *key, const char *path, const char *passphr
 	free(outdata);
 	return ERR_OK;
 }
+
 static int gpg_key_load(LQStore *store, struct gpg_store *gpg, const char *passphrase, enum gpg_find_mode_e mode, const void *criteria) {
 	int r;
 	char *p;
@@ -478,9 +479,9 @@ static int gpg_key_load(LQStore *store, struct gpg_store *gpg, const char *passp
 	if (r) {
 		return debug_logerr(LLOG_ERROR, ERR_FAIL, NULL);
 	}
+	debug_x(LLOG_INFO, "gpg", "loaded private key", 1, MORGEL_TYP_BIN, LQ_FP_LEN, "fingerprint", gpg->fingerprint);
 	
 	return ERR_OK;
-
 }
 
 /// Implements the interface to load a private key from storage.
diff --git a/src/debug.c b/src/debug.c
@@ -46,15 +46,15 @@ void llog_out(const char *s) {
 static void debug_out(enum lloglvl_e lvl, const char *ns, const char *msg) {
 	char *p;
 
-	p = llog_new_ns(LLOG_DEBUG, (char*)msg, (char*)ns);
+	p = llog_new_ns(lvl, (char*)msg, (char*)ns);
 	llog_out(p);
 }
 
-void debug_dbg(const char *ns, const char *msg) {
-	debug_out(LLOG_DEBUG, (char*)ns, (char*)msg);
+void debug(enum lloglvl_e lvl, const char *ns, const char *msg) {
+	debug_out(lvl, (char*)ns, (char*)msg);
 }
 
-void debug_dbg_x(const char *ns, const char *msg, int argc, ...) {
+void debug_x(enum lloglvl_e lvl, const char *ns, const char *msg, int argc, ...) {
 	int i;
 	long long l;
 	char *k;
@@ -65,7 +65,7 @@ void debug_dbg_x(const char *ns, const char *msg, int argc, ...) {
 
 	va_start(vv, argc);
 
-	p = llog_new_ns(LLOG_DEBUG, (char*)msg, (char*)ns);
+	p = llog_new_ns(lvl, (char*)msg, (char*)ns);
 
 	for (i = 0; i < argc; i++) {
 		typ = va_arg(vv, enum debug_typ_e);
diff --git a/src/debug.h b/src/debug.h
@@ -18,22 +18,24 @@ enum debug_typ_e {
  * \param[in] Namespace string. If NULL, will use the default namespace.
  * \param[in] Literal message to log.
  */
-void debug_dbg(const char *ns, const char *msg);
+void debug(enum lloglvl_e lvl, const char *ns, const char *msg);
 
 /**
  * \brief Log a structured message with the given namespace.
  *
- * Each structured argument consist of three parameters:
+ * Each structured parameter consist of four arguments:
  *	1. An enum debug_typ_e specifying the type of value (and thus how to format it)
  *	2. An int value specifying the length of the value behind the pointer, in bytes. Currently only used with MORGEL_TYPE_BIN
- *	3. Pointer to value.
+ *	3. Pointer to key string.
+ *	4. Pointer to value.
  *
+ * \param[in] The log level.
  * \param[in] Namespace string. If NULL, will use the default namespace.
  * \param[in] Main message to log.
- * \param[in] Number of structured key/value arguments.
+ * \param[in] Number of structured values. 
  * \param[in] Key/value list (see above)
  */
-void debug_dbg_x(const char *ns, const char *msg, int argc, ...);
+void debug_x(enum lloglvl_e lvl, const char *ns, const char *msg, int argc, ...);
 
 /**
  * \brief Convenience function to log a single error, using rerr for error code to string resolution.
diff --git a/src/test/test_debug.c b/src/test/test_debug.c
@@ -1,13 +1,14 @@
 #include <check.h>
 #include <stdlib.h>
+#include <llog.h>
 
 #include "debug.h"
 
 START_TEST(check_debug_novar) {
-	debug_dbg("test", "foo");
-	debug_dbg_x("test", "foo", 1, MORGEL_TYP_STR, 0, "bar", "baz");
-	debug_dbg_x("test", "foo", 1, MORGEL_TYP_BIN, 3, "inky", "pinky");
-	debug_dbg_x("test", "foo", 1, MORGEL_TYP_NUM, 0, "xyzzy", 42);
+	debug(LLOG_DEBUG, "test", "foo");
+	debug_x(LLOG_DEBUG, "test", "foo", 1, MORGEL_TYP_STR, 0, "bar", "baz");
+	debug_x(LLOG_DEBUG, "test", "foo", 1, MORGEL_TYP_BIN, 3, "inky", "pinky");
+	debug_x(LLOG_DEBUG, "test", "foo", 1, MORGEL_TYP_NUM, 0, "xyzzy", 42);
 }
 END_TEST