fix typos caught by gcc not encountered with Windows build

bk: 58abc03fyZ6b5zF_J3873fVM6px5zQ

diff --git a/include/ntp_md5.h b/include/ntp_md5.h
index 71332644fe9d482c08a80a2e872eb10741c0c6e9..01b417a805169eb7d4912f772046aca82a41d487 100644 (file)
--- a/include/ntp_md5.h
+++ b/include/ntp_md5.h
@@ -7,7 +7,6 @@
 #define NTP_MD5_H
 
 #ifdef OPENSSL
-# include "openssl/cmac.h"
 # include "openssl/evp.h"
 # include "libssl_compat.h"
 #else  /* !OPENSSL follows */

diff --git a/libntp/ssl_init.c b/libntp/ssl_init.c
index bf3f0c04c92cb82016c27a530eebf1adfb9e71eb..90dd7308015ee22099b5f56a5a1f7d430e0a413a 100644 (file)
--- a/libntp/ssl_init.c
+++ b/libntp/ssl_init.c
@@ -5,7 +5,7 @@
  * Moved from ntpd/ntp_crypto.c crypto_setup()
  */
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 #include <ctype.h>
 #include <ntp.h>
@@ -13,16 +13,16 @@
 #include <lib_strbuf.h>
 
 #ifdef OPENSSL
-#include "openssl/cmac.h"
-#include "openssl/crypto.h"
-#include "openssl/err.h"
-#include "openssl/evp.h"
-#include "openssl/opensslv.h"
-#include "libssl_compat.h"
+# include "openssl/cmac.h"
+# include "openssl/crypto.h"
+# include "openssl/err.h"
+# include "openssl/evp.h"
+# include "openssl/opensslv.h"
+# include "libssl_compat.h"
 
-#define MD5_LENGTH     16
-#define CMAC_LENGTH    16
-#define CMAC           "AES128CMAC"
+# define MD5_LENGTH    16
+# define CMAC_LENGTH   16
+# define CMAC          "AES128CMAC"
 
 int ssl_init_done;
 
@@ -102,7 +102,6 @@ keytype_from_text(
        u_int           digest_len;
 #ifdef OPENSSL
        const u_long    max_digest_len = MAX_MAC_LEN - sizeof(keyid_t);
-       u_char          digest[EVP_MAX_MD_SIZE];
        char *          upcased;
        char *          pch;
 
@@ -140,9 +139,8 @@ keytype_from_text(
 
        if (NULL != pdigest_len) {
 #ifdef OPENSSL
-               EVP_MD *        md;
+               const EVP_MD *  md = EVP_get_digestbynid(key_type);
 
-               md = EVP_get_digestbynid(key_type);
                digest_len = (md) ? EVP_MD_size(md) : 0;
 
                if (!md || digest_len <= 0) {

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 2efc7c74cbbaff767004254739f2687c43541359..8ae3834cf93d05d3937d3ae699284406e073f8a9 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -452,6 +452,14 @@ main(
 }
 #endif
 
+#ifdef OPENSSL
+# ifdef HAVE_EVP_MD_DO_ALL_SORTED
+#  define K_PER_LINE 8
+#  define K_NL_PFX_STR "\n    "
+#  define K_DELIM_STR ", "
+# endif
+#endif
+
 #ifndef BUILD_AS_LIB
 int
 ntpqmain(
@@ -463,10 +471,6 @@ ntpqmain(
        size_t icmd;
 #ifdef OPENSSL
 # ifdef HAVE_EVP_MD_DO_ALL_SORTED
-#  define K_PER_LINE 8
-#  define K_NL_PFX_STR "\n    "
-#  define K_DELIM_STR ", "
-
        int nl;
        int append;
        size_t len;
@@ -528,18 +532,23 @@ ntpqmain(
                cmac_p = strstr(list, cmac_sn);
 
                /* CMAC in list if found followed by null or "," */
-               if (cmac_p)
+               if (cmac_p) {
                        cmac_p += strlen(cmac_sn);
+               }
 
-               append = !(cmap_p && (!*cmap_p || ',' == *cmap_p));
+               append = !(cmac_p && (!*cmac_p || ',' == *cmac_p));
 
                if (append) {
                    char *last_nl;
 
                    len = strlen(list) + strlen(CMAC);
                    /* Check if new entry will fit on last line */
-                   last_nl = strrchr(list, "\n");
-                   if (!last_nl)       last_nl = list;
+                   last_nl = strrchr(list, '\n');
+
+                   if (!last_nl) {
+                           last_nl = list;
+                   }
+
                    /* Do we need a new line? */
                    nl = (len - (last_nl - list) + strlen(K_DELIM_STR) > 72);
                    len += (nl) ? strlen(K_NL_PFX_STR) : strlen(K_DELIM_STR);
@@ -548,10 +557,11 @@ ntpqmain(
            }
 
            /* Check if we need to append an entry */
-           if (append)
+           if (append) {
                sprintf(list + strlen(list), "%s%s",
                        ((nl) ? K_NL_PFX_STR : K_DELIM_STR),
                        CMAC);
+           }
 # endif
 
            my_easprintf(&msg,

diff --git a/ports/winnt/scripts/mkver.bat b/ports/winnt/scripts/mkver.bat
index eac3f1065733f4f1f2a418642b343cac8ad85ecc..d36661aae2c811d359288002010b21c6068e4c87 100755 (executable)
--- a/ports/winnt/scripts/mkver.bat
+++ b/ports/winnt/scripts/mkver.bat
@@ -1,4 +1,4 @@
-@echo on
+@echo off
 GOTO PROG
 
 see notes/remarks directly below this header:

diff --git a/sntp/crypto.c b/sntp/crypto.c
index b0b360c8016eaf9f5a6660daf2a7555b9b3ce6c3..ecafb40f5a971e9179e31781667fa65f7b1a9570 100644 (file)
--- a/sntp/crypto.c
+++ b/sntp/crypto.c
@@ -4,6 +4,11 @@
 #include "isc/string.h"
 #include "ntp_md5.h"
 
+#ifdef OPENSSL
+# include "openssl/cmac.h"
+# define  CMAC         "AES128CMAC"
+#endif
+
 struct key *key_ptr;
 size_t key_cnt = 0;
 
@@ -29,25 +34,29 @@ make_mac(
 
 #ifdef OPENSSL
        /* Check if CMAC key type specific code required */
-       if (key_type = NID_cmac) {
+       if (key_type == NID_cmac) {
            CMAC_CTX *      ctx;
 
            if (!(ctx = CMAC_CTX_new())) {
                fprintf(stderr,  "make_mac: CMAC %s CTX new failed.\n", CMAC);
                msyslog(LOG_ERR, "make_mac: CMAC %s CTX new failed.",   CMAC);
+               len = 0;
            } else
            if (!CMAC_Init(ctx, (const u_char *)cmp_key->key_seq,
                        (u_int)cmp_key->key_len, EVP_aes_128_cbc(), NULL)) {
                fprintf(stderr,  "make_mac: CMAC %s Init failed.\n",    CMAC);
                msyslog(LOG_ERR, "make_mac: CMAC %s Init failed.",      CMAC);
+               len = 0;
            } else
            if (!CMAC_Update(ctx, pkt_data, (u_int)pkt_size)) {
                fprintf(stderr,  "make_mac: CMAC %s Update failed.\n",  CMAC);
                msyslog(LOG_ERR, "make_mac: CMAC %s Update failed.",    CMAC);
+               len = 0;
            } else
            if (!CMAC_Final(ctx, digest, &len)) {
                fprintf(stderr,  "make_mac: CMAC %s Final failed.\n",   CMAC);
                msyslog(LOG_ERR, "make_mac: CMAC %s Final failed.",     CMAC);
+               len = 0;
            }
 
            CMAC_CTX_cleanup(ctx);
@@ -55,18 +64,21 @@ make_mac(
 #endif
            EVP_MD_CTX *        ctx;
 
-#ifdef OPENSSL
            if (!(ctx = EVP_MD_CTX_new())) {
                fprintf(stderr,  "make_mac: MAC %s Digest CTX new failed.\n",
                                                        cmp_key->type);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest CTX new failed.",
                                                        cmp_key->type);
-           } else
+               len = 0;
+           }
+#ifdef OPENSSL /* OpenSSL 1 supports return codes 0 fail, 1 okay */
+           else
            if (!EVP_DigestInit(ctx, EVP_get_digestbynid(key_type))) {
                fprintf(stderr,  "make_mac: MAC %s Digest Init failed.\n",
                                                        cmp_key->type);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Init failed.",
                                                        cmp_key->type);
+               len = 0;
            } else
            if (!EVP_DigestUpdate(ctx, (const u_char *)cmp_key->key_seq,
                                                (u_int)cmp_key->key_len)) {
@@ -74,21 +86,23 @@ make_mac(
                                                        cmp_key->type);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Update key failed.",
                                                        cmp_key->type);
+               len = 0;
            } else
            if (!EVP_DigestUpdate(ctx, pkt_data, (u_int)pkt_size)) {
                fprintf(stderr,  "make_mac: MAC %s Digest Update data failed.\n",
                                                        cmp_key->type);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Update data failed.",
                                                        cmp_key->type);
+               len = 0;
            } else
            if (!EVP_DigestFinal(ctx, digest, &len)) {
                fprintf(stderr,  "make_mac: MAC %s Digest Final failed.\n",
                                                        cmp_key->type);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Final failed.",
                                                        cmp_key->type);
+               len = 0;
            }
 #else /* !OPENSSL */
-           ctx = EVP_MD_CTX_new();
            EVP_DigestInit(ctx, EVP_get_digestbynid(key_type));
            EVP_DigestUpdate(ctx, (const u_char *)cmp_key->key_seq,
                                                (u_int)cmp_key->key_len);