[Bug 3430] ntpq dumps core (SIGSEGV) for "keytype md2"

 - fix MD5 fallback: only 'M' as keytype accepted
 - provide full digest list with MSVC for OpenSSL v1.0.1 and above

bk: 59afd7bf3IUWiot4M93rBZnT1lNnpg

diff --git a/libntp/ssl_init.c b/libntp/ssl_init.c
index 4378263c0dec148f2e6840feef611ca25d9e17ac..a3c163b34e3772c9e71a4a39a3baa9ac2d2ca2fa 100644 (file)
--- a/libntp/ssl_init.c
+++ b/libntp/ssl_init.c
@@ -118,7 +118,7 @@ keytype_from_text(
                *pch = (char)toupper((unsigned char)*pch);
 
        md = EVP_get_digestbyname(upcased);
-       if (NULL == md && 'M' == upcased[0])
+       if (NULL == md && !strcmp(upcased, "M"))
                md = EVP_get_digestbyname("MD5");
        if (NULL == md)
                return 0;

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index f14a823cb412f8c006276aff837a7c34238bc65a..7c14b96524417946c91f5f67b31a07dd5e4ec82d 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -3584,6 +3584,12 @@ ntpq_custom_opt_handler(
  * Obtain list of digest names
  */
 
+#if defined(OPENSSL) && !defined(HAVE_EVP_MD_DO_ALL_SORTED)
+# if defined(_MSC_VER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
+#  define HAVE_EVP_MD_DO_ALL_SORTED
+# endif
+#endif
+
 #ifdef OPENSSL
 # ifdef HAVE_EVP_MD_DO_ALL_SORTED
 struct hstate {