From: Dave Hart <hart@ntp.org>
Date: Wed, 11 Nov 2009 12:38:51 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P244_RC~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a8efd9959e0ab0e189daa9a366c9500af3090cd;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1376

bk: 4afab05boWNhjTHj25AxdCh664W-PA
---

4a8efd9959e0ab0e189daa9a366c9500af3090cd
diff --cc ChangeLog
index dd2dd65b2,16c88538a..3d05c8278
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,11 @@@
+ * [Bug 1003] ntpdc unconfig command doesn't prompt for keyid.
+ * [Bug 1376] Enable authenticated ntpq and ntpdc using newly-available
+   digest types.
+ * ntp-keygen, Autokey OpenSSL build vs. run version mismatch is now a
+   non-fatal warning.
 +(4.2.5p243-RC) 2009/11/11 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1226] Fix deferred DNS lookups.
 +* new crypto signature cleanup.
  (4.2.5p242-RC) 2009/11/10 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1363] CID 92 clarify fallthrough case in clk_trimtsip.c
  * [Bug 1366] ioctl(TIOCSCTTY, 0) fails on NetBSD *[0-2].* > 3.99.7.
diff --cc libntp/authreadkeys.c
index b329159e5,e757bd859..a64d4ef7e
--- a/libntp/authreadkeys.c
+++ b/libntp/authreadkeys.c
@@@ -130,18 -127,13 +130,13 @@@ authreadkeys
  			continue;
  		}
  #ifdef OPENSSL
- 
  		/*
- 		 * If the key type is 'M' or 'm', it is replaced by 'MD5".
- 		 * In any case, it must be one of the algorithms supported
- 		 * by OpenSSL. The key type is the NID used by the message
- 		 * digest algorithm. Ther are a number of inconsistencies in
- 		 * the OpenSSL database. We attempt to discover them here
- 		 * and prevent use of inconsistent data later.
+ 		 * The key type is the NID used by the message digest 
+ 		 * algorithm. There are a number of inconsistencies in
+ 		 * the OpenSSL database. We attempt to discover them
 -		 * here and prevent use of inconsistent data.
++		 * here and prevent use of inconsistent data later.
  		 */
- 		if (strcmp(token, "M") == 0 || strcmp(token, "m") == 0)
- 			token  = "MD5";
- 		keytype = OBJ_sn2nid(token);
+ 		keytype = keytype_from_text(token, NULL);
  		if (keytype == 0 || keytype > 255) {
  			msyslog(LOG_ERR,
  			    "authreadkeys: invalid type for key %d", keyno);