From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 22 Apr 2015 11:25:54 +0000 (+0000)
Subject: [Bug 2776] Improve ntpq's 'help keytype'
X-Git-Tag: NTP_4_3_17~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cf496e83a702847a32f265bd7a43371d3b896d6;p=thirdparty%2Fntp.git

[Bug 2776] Improve ntpq's 'help keytype'

bk: 553785420DrN0zt_wMUsaQPrnaH7ig
---

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 68c867b29..fbace0ad1 100644
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -3533,6 +3533,7 @@ static char *list_digest_names(void)
     char *list = NULL;
 
 #ifdef OPENSSL
+# ifdef HAVE)EVP_MD_DO_ALL_SORTED
     struct hstate hstate = { NULL, NULL, K_PER_LINE+1 };
 
     hstate.seen = (const char **)calloc(1, sizeof( const char * ));
@@ -3541,9 +3542,13 @@ static char *list_digest_names(void)
     EVP_MD_do_all_sorted(list_md_fn, &hstate);
     list = hstate.list;
     free(hstate.seen);
+# else
+    list = (char *)malloc(sizeof("md5, others (upgrade to OpenSSL-1.0 for full list)"));
+    strcpy(list, "md5, others (upgrade to OpenSSL-1.0 for full list)");
+# endif
 #else
     list = (char *)malloc(sizeof("md5"));
-    strcpy(list,"md5");
+    strcpy(list, "md5");
 #endif
 
     return list;
diff --git a/sntp/m4/ntp_openssl.m4 b/sntp/m4/ntp_openssl.m4
index 9d9189ce9..2f3afa010 100644
--- a/sntp/m4/ntp_openssl.m4
+++ b/sntp/m4/ntp_openssl.m4
@@ -225,6 +225,7 @@ AC_MSG_RESULT([$ntp_openssl])
 
 case "$ntp_openssl" in
  yes)
+    AC_CHECK_FUNCS([EVP_MD_do_all_sorted])
     AC_DEFINE([OPENSSL], [], [Use OpenSSL?])
     case "$VER_SUFFIX" in
      *o*) ;;