[Minor] Allow to flatten keypair output

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index bea32134f7650a7c4c80b63d7da3e2795980a4ad..71f63adbd6f40d14ac95ce2a09a3fd284f1d535a 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -1882,7 +1882,8 @@ rspamd_fuzzy_stat_to_ucl (struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat
                                ucl_object_insert_key (elt, ip_elt, "ips", 0, false);
                        }
 
-                       ucl_object_insert_key (elt, rspamd_keypair_to_ucl (fuzzy_key->key, RSPAMD_KEYPAIR_DUMP_NO_SECRET),
+                       ucl_object_insert_key (elt,
+                               rspamd_keypair_to_ucl (fuzzy_key->key, RSPAMD_KEYPAIR_DUMP_NO_SECRET|RSPAMD_KEYPAIR_DUMP_FLATTENED),
                                "keypair", 0, false);
                        ucl_object_insert_key (keys_obj, elt, keyname, 0, true);
                }

diff --git a/src/libcryptobox/keypair.c b/src/libcryptobox/keypair.c
index b97cd699e6c8a18e24f81e1c2889d7784324742d..2ef99652738559a22b18a1c5661c04e926193ecb 100644 (file)
--- a/src/libcryptobox/keypair.c
+++ b/src/libcryptobox/keypair.c
@@ -805,9 +805,16 @@ rspamd_keypair_to_ucl (struct rspamd_cryptobox_keypair *kp,
                encoding = "base32";
        }
 
-       ucl_out = ucl_object_typed_new (UCL_OBJECT);
-       elt = ucl_object_typed_new (UCL_OBJECT);
-       ucl_object_insert_key (ucl_out, elt, "keypair", 0, false);
+       if (flags & RSPAMD_KEYPAIR_DUMP_FLATTENED) {
+               ucl_out = ucl_object_typed_new (UCL_OBJECT);
+               elt = ucl_out;
+       }
+       else {
+               ucl_out = ucl_object_typed_new (UCL_OBJECT);
+               elt = ucl_object_typed_new (UCL_OBJECT);
+               ucl_object_insert_key (ucl_out, elt, "keypair", 0, false);
+       }
+
 
        /* pubkey part */
        keypair_out = rspamd_keypair_print (kp,

diff --git a/src/libcryptobox/keypair.h b/src/libcryptobox/keypair.h
index ed247e8ca5bebe0919bfd3a6190fefb9d93e4b49..18a87d7f588aec2f6b888719e115f71c077572ba 100644 (file)
--- a/src/libcryptobox/keypair.h
+++ b/src/libcryptobox/keypair.h
@@ -249,6 +249,7 @@ enum rspamd_keypair_dump_flags {
        RSPAMD_KEYPAIR_DUMP_DEFAULT = 0,
        RSPAMD_KEYPAIR_DUMP_HEX = 1u << 0u,
        RSPAMD_KEYPAIR_DUMP_NO_SECRET = 1u << 1u,
+       RSPAMD_KEYPAIR_DUMP_FLATTENED = 1u << 2u,
 };
 
 /**