[Bug 2537] ntpd truncates symmetric keys to 20 bytes

bk: 53392209U9Q4rv6GkFRLCrJke6JnPg

diff --git a/ChangeLog b/ChangeLog
index 5414f5ed4a3a64f5bc7f4415e600aec3df5b7187..f08306155cb199fff420eac14d38066130fa104b 100644 (file)
--- 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 1b72cd0f966e3a1e74739e091414846c2730f7a0..9b02119d169a9e74c15440e391e296b701d70c1c 100644 (file)
--- 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";