From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 30 Jul 2020 13:42:10 +0000 (+0100)
Subject: [Minor] Distinguish invalid and missing keypair
X-Git-Tag: 2.6~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e92d01d68c4d119d5df9b8d3533aa737a3496732;p=thirdparty%2Frspamd.git

[Minor] Distinguish invalid and missing keypair
---

diff --git a/src/rspamadm/signtool.c b/src/rspamadm/signtool.c
index d92071bfa4..03f6ac60e8 100644
--- a/src/rspamadm/signtool.c
+++ b/src/rspamadm/signtool.c
@@ -592,8 +592,13 @@ rspamadm_signtool (gint argc, gchar **argv, const struct rspamadm_command *cmd)
 
 		kp = rspamd_keypair_from_ucl (top);
 
-		if (kp == NULL || rspamd_keypair_type (kp) != RSPAMD_KEYPAIR_SIGN) {
-			rspamd_fprintf (stderr, "invalid or unsuitable for signing key\n");
+		if (kp == NULL) {
+			rspamd_fprintf (stderr, "invalid signing key\n");
+			exit (EXIT_FAILURE);
+		}
+
+		if (rspamd_keypair_type (kp) != RSPAMD_KEYPAIR_SIGN) {
+			rspamd_fprintf (stderr, "unsuitable for signing key\n");
 			exit (EXIT_FAILURE);
 		}