From: Juergen Perlinger <perlinger@ntp.org>
Date: Wed, 23 Nov 2016 07:34:52 +0000 (+0100)
Subject: Bug 3144 - NTP does not build without openSSL
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5430fa2c1e3bcfd8f4c8cde55fc9751b1ced1024;p=thirdparty%2Fntp.git

Bug 3144 - NTP does not build without openSSL
 - fix SNTP to build '--without-crypto',too
 - remove some warnings that result from '--without-crypto'

bk: 5835469cqMGN9NXnZSAlHMx9Fiovsw
---

diff --git a/ntpd/ntp_control.c b/ntpd/ntp_control.c
index 7825b40d6..49a3297c6 100644
--- a/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@ -1651,8 +1651,10 @@ ctl_putuint(
 }
 
 /*
- * ctl_putcal - write a decoded calendar data into the response
+ * ctl_putcal - write a decoded calendar data into the response.
+ * only used with AUTOKEY currently, so compiled conditional
  */
+#ifdef AUTOKEY
 static void
 ctl_putcal(
 	const char *tag,
@@ -1676,6 +1678,7 @@ ctl_putcal(
 
 	return;
 }
+#endif
 
 /*
  * ctl_putfs - write a decoded filestamp into the response
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index ad04ed4ac..41744aa39 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -4054,7 +4054,7 @@ peer_xmit(
 		    ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen,
 		    peer->keynumber));
 #else	/* !AUTOKEY follows */
-	DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %d\n",
+	DPRINTF(1, ("peer_xmit: at %ld %s->%s mode %d keyid %08x len %zu\n",
 		    current_time, peer->dstadr ?
 		    ntoa(&peer->dstadr->sin) : "-",
 		    ntoa(&peer->srcadr), peer->hmode, xkeyid, sendlen));
diff --git a/sntp/crypto.c b/sntp/crypto.c
index 7b4e63833..e45b21360 100644
--- a/sntp/crypto.c
+++ b/sntp/crypto.c
@@ -2,7 +2,7 @@
 #include "crypto.h"
 #include <ctype.h>
 #include "isc/string.h"
-#include "libssl_compat.h"
+#include "ntp_md5.h"
 
 struct key *key_ptr;
 size_t key_cnt = 0;