Merge bk://www.ntp.org/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1376

bk: 4afab05boWNhjTHj25AxdCh664W-PA

diff --cc ChangeLog
index dd2dd65b237a981a525d300eead0b6990ae576d0,16c88538addaa8efeaad022540af36dd3033c580..3d05c8278f2f3f110c4110179fb2672b70e705c8
--- 1/ChangeLog
--- 2/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 b329159e56f47d9b9332e4cf81a3bfe5b4267034,e757bd8599706d1cf881f828b56d1fcf0b7da264..a64d4ef7ebb9855969b582d880b6075489c90e87
--- 1/libntp/authreadkeys.c
--- 2/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);

diff --cc ntpd/ntp_intres.c
Simple merge