From: Juergen Perlinger <perlinger@ntp.org>
Date: Thu, 7 Sep 2017 09:11:08 +0000 (+0200)
Subject: [Bug 3430] ntpq dumps core (SIGSEGV) for "keytype md2"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=931902eaf0803fe17a3f2f20220b32467144399f;p=thirdparty%2Fntp.git

[Bug 3430] ntpq dumps core (SIGSEGV) for "keytype md2"
 - sidekick: permit longer key type (hash algo names) for SNTP

bk: 59b10d2cqSh0BkwudoW-VSPqWosyTA
---

diff --git a/sntp/crypto.c b/sntp/crypto.c
index 25bdbf8db..1158b3cac 100644
--- a/sntp/crypto.c
+++ b/sntp/crypto.c
@@ -139,7 +139,7 @@ auth_init(
 		if (octothorpe)
 			*octothorpe = '\0';
 		act = emalloc(sizeof(*act));
-		scan_cnt = sscanf(kbuf, "%d %9s %128s", &act->key_id, act->typen, keystring);
+		scan_cnt = sscanf(kbuf, "%d %19s %128s", &act->key_id, act->typen, keystring);
 		if (scan_cnt == 3) {
 			int len = strlen(keystring);
 			goodline = 1;	/* assume best for now */
diff --git a/sntp/crypto.h b/sntp/crypto.h
index 72a5a97de..961dca042 100644
--- a/sntp/crypto.h
+++ b/sntp/crypto.h
@@ -21,7 +21,7 @@ struct key {
 	int		key_id;
 	int		key_len;
 	int		typei;
-	char		typen[10];
+	char		typen[20];
 	char		key_seq[64];
 };