From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 31 Mar 2014 08:06:33 +0000 (-0400)
Subject: [Bug 2537] ntpd truncates symmetric keys to 20 bytes
X-Git-Tag: NTP_4_2_7P437~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9114aedeb41826b8fb3cde652e1b7fa0efaa17bc;p=thirdparty%2Fntp.git

[Bug 2537] ntpd truncates symmetric keys to 20 bytes

bk: 53392209U9Q4rv6GkFRLCrJke6JnPg
---

diff --git a/ChangeLog b/ChangeLog
index 5414f5ed4..f08306155 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2537] ntpd truncates symmetric keys to 20 bytes.
 * [Bug 2546] Documentation updates.
 (4.2.7p436) 2014/03/31 Released by Harlan Stenn <stenn@ntp.org>
 * Update to libopts-40.2.15, and autogen-5.18.3pre18.
diff --git a/libntp/authreadkeys.c b/libntp/authreadkeys.c
index 1b72cd0f9..9b02119d1 100644
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@ -76,7 +76,7 @@ authreadkeys(
 	keyid_t	keyno;
 	int	keytype;
 	char	buf[512];		/* lots of room for line */
-	u_char	keystr[20];
+	u_char	keystr[32];		/* Bug 2537 */
 	int	len;
 	int	j;
 
@@ -175,7 +175,7 @@ authreadkeys(
 			continue;
 		}
 		len = strlen(token);
-		if (len <= sizeof(keystr)) {
+		if (len <= 20) {	/* Bug 2537 */
 			MD5auth_setkey(keyno, keytype, (u_char *)token, len);
 		} else {
 			char	hex[] = "0123456789abcdef";