[Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL

bk: 5aa62c12Cfr_EYedIX5KSdNgaf0DPA

diff --git a/ChangeLog b/ChangeLog
index dcfa59c07f3fb687e22c57016ce0cd382df674e5..02ecbc4ad31249cf4b5e7e4047a5be2340299816 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+---
+* [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>
+
 ---
 (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>
 

diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index 7dc7e7ecf40dd3c628cf1cfb70ee83aa9ac25e0c..30073a076c5ec2a5bf94af3b14e526343e4826b7 100644 (file)
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -153,7 +153,7 @@ make_mac(
        if (ktype == NID_md5)
        {
                EVP_MD_CTX *    ctx   = EVP_MD_CTX_new();
-               uint            uilen = 0;
+               u_int           uilen = 0;
 
                if (digest->len < 16) {
                        msyslog(LOG_ERR, "%s", "MAC encrypt: MAC md5 buf too small.");

diff --git a/util/sht.c b/util/sht.c
index dfd97ffb9f1f554367d8aea728127538da996de3..d0e07218ae62f5535ed46aba5362608be5957095 100644 (file)
--- a/util/sht.c
+++ b/util/sht.c
@@ -196,7 +196,7 @@ again:
                 * certain jitter!)
                 */
                time_t clk_sec, rcv_sec;
-               uint   clk_frc, rcv_frc;
+               u_int  clk_frc, rcv_frc;
 
 #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_REALTIME)
                
@@ -206,17 +206,17 @@ again:
                struct timespec tmptime;
                if (0 == clock_gettime(CLOCK_REALTIME, &tmptime)) {
                        rcv_sec = tmptime.tv_sec;
-                       rcv_frc = (uint)tmptime.tv_nsec;
+                       rcv_frc = (u_int)tmptime.tv_nsec;
                }
                else
 #endif
                {
                        time(&rcv_sec);
-                       rcv_frc = (uint)random() % 1000000000u;
+                       rcv_frc = (u_int)random() % 1000000000u;
                }
                /* add a wobble of ~3.5msec to the clock time */
                clk_sec = rcv_sec;
-               clk_frc = rcv_frc + (uint)(random()%7094713 - 3547356);
+               clk_frc = rcv_frc + (u_int)(random()%7094713 - 3547356);
                /* normalise result -- the SHM driver is picky! */
                while ((int)clk_frc < 0) {
                        clk_frc += 1000000000;