From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 2 Feb 2016 18:02:10 +0000 (+0000)
Subject: Add more fields to ucl definition of the keypair
X-Git-Tag: 1.1.3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29f54d263c352640cfcf386a062f5ff37b401f7e;p=thirdparty%2Frspamd.git

Add more fields to ucl definition of the keypair
---

diff --git a/src/rspamadm/keypair.c b/src/rspamadm/keypair.c
index be33a65124..8b3c8255b7 100644
--- a/src/rspamadm/keypair.c
+++ b/src/rspamadm/keypair.c
@@ -167,6 +167,12 @@ rspamadm_keypair (gint argc, gchar **argv)
 			ucl_object_insert_key (elt,
 					ucl_object_fromstring (encoding),
 					"encoding", 0, false);
+			ucl_object_insert_key (elt,
+					ucl_object_fromstring (openssl ? "nistp256" : "curve25519"),
+					"algorithm", 0, false);
+			ucl_object_insert_key (elt,
+					ucl_object_fromstring ("kex"),
+					"type", 0, false);
 
 			ucl_emit_subr = ucl_object_emit_file_funcs (stdout);
 			ucl_object_emit_full (ucl_out, UCL_EMIT_CONFIG, ucl_emit_subr);
@@ -236,6 +242,13 @@ rspamadm_keypair (gint argc, gchar **argv)
 					ucl_object_fromstring (encoding),
 					"encoding", 0, false);
 
+			ucl_object_insert_key (elt,
+					ucl_object_fromstring (openssl ? "nistp256" : "curve25519"),
+					"algorithm", 0, false);
+			ucl_object_insert_key (elt,
+					ucl_object_fromstring ("sign"),
+					"type", 0, false);
+
 			ucl_emit_subr = ucl_object_emit_file_funcs (stdout);
 			ucl_object_emit_full (ucl_out, UCL_EMIT_CONFIG, ucl_emit_subr);
 			ucl_object_emit_funcs_free (ucl_emit_subr);