Merge cleanup

bk: 5a1d0b5fvVqB9hToBoa2UlLhXKbEEQ

diff --git a/libntp/ssl_init.c b/libntp/ssl_init.c
index 2dc3ea841b65a28fa2e3f431f4bcdfafa4a25b49..0279bfeb982c4e0b426cdf3f9a06c2ff92021a88 100644 (file)
--- a/libntp/ssl_init.c
+++ b/libntp/ssl_init.c
@@ -101,6 +101,7 @@ keytype_from_text(
        int             key_type;
        u_int           digest_len;
 #ifdef OPENSSL /* --*-- OpenSSL code --*-- */
+       const u_long    max_digest_len = MAX_MAC_LEN - sizeof(keyid_t);
        char *          upcased;
        char *          pch;
        EVP_MD const *  md;

diff --git a/ntpd/ntpd.html b/ntpd/ntpd.html
index 348f3fb1cb20327e19ef6877901420d5580470e8..676a758bd8b39fa25aac1e191d8ec37434180c60 100644 (file)
--- a/ntpd/ntpd.html
+++ b/ntpd/ntpd.html
@@ -225,7 +225,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpd - NTP daemon program - Ver. 4.2.8p10-x
+<pre class="example">ntpd - NTP daemon program - Ver. 4.2.8p10
 Usage:  ntpd [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ &lt;server1&gt; ... &lt;serverN&gt; ]
   Flg Arg Option-Name    Description

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index fa35b69eccc224a1d7251b31f63bb39ed7f151d0..efdf6ec047b25b2a1b47ac94d233f27b4d91b331 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -3628,6 +3628,7 @@ list_md_fn(const EVP_MD *m, const char *from, const char *to, void *arg)
     size_t       len, n, digest_len;
     const char   *name, **seen;
     struct hstate *hstate = arg;
+    char         *cp;
 
     /* m is MD obj, from is name or alias, to is base name for alias */
     if (!m || !from || to) {

diff --git a/ntpq/ntpq.html b/ntpq/ntpq.html
index ef0773857059a1957e2fa54d3258d69e499cc668..b84d2ff70eafe7a64f60ff5579f0b009b0bd9105 100644 (file)
--- a/ntpq/ntpq.html
+++ b/ntpq/ntpq.html
@@ -858,7 +858,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <samp><span class="file">more</span></samp>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpq - standard NTP query program - Ver. 4.2.8p10-x
+<pre class="example">ntpq - standard NTP query program - Ver. 4.2.8p10
 Usage:  ntpq [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 name resolution

diff --git a/sntp/crypto.c b/sntp/crypto.c
index 04e34e9e8a04b0b4e661266c8f868da7ff19db62..3f3f310b80f7eafb3b4f84ba5a92006e15b8c768 100644 (file)
--- a/sntp/crypto.c
+++ b/sntp/crypto.c
@@ -30,7 +30,7 @@ make_mac(
                return 0;
 
        INIT_SSL();
-       key_type = keytype_from_text(cmp_key->type, NULL);
+       key_type = keytype_from_text(cmp_key->typen, NULL);
 
 #ifdef OPENSSL
        /* Check if CMAC key type specific code required */
@@ -72,40 +72,40 @@ make_mac(
 
            if (!(ctx = EVP_MD_CTX_new())) {
                fprintf(stderr,  "make_mac: MAC %s Digest CTX new failed.\n",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest CTX new failed.",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                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);
+                                                       cmp_key->typen);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Init failed.",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                len = 0;
            } else
            if (!EVP_DigestUpdate(ctx, (const u_char *)cmp_key->key_seq,
                                                (u_int)cmp_key->key_len)) {
                fprintf(stderr,  "make_mac: MAC %s Digest Update key failed.\n",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Update key failed.",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                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);
+                                                       cmp_key->typen);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Update data failed.",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                len = 0;
            } else
            if (!EVP_DigestFinal(ctx, digest, &len)) {
                fprintf(stderr,  "make_mac: MAC %s Digest Final failed.\n",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                msyslog(LOG_ERR, "make_mac: MAC %s Digest Final failed.",
-                                                       cmp_key->type);
+                                                       cmp_key->typen);
                len = 0;
            }
 #else /* !OPENSSL */
@@ -222,9 +222,9 @@ auth_init(
                if (octothorpe)
                        *octothorpe = '\0';
                act = emalloc(sizeof(*act));
-               /* keep width 15 = sizeof struct key.type - 1 synced */
+               /* keep width 15 = sizeof struct key.typen - 1 synced */
                scan_cnt = sscanf(kbuf, "%d %15s %128s",
-                                       &act->key_id, act->type, keystring);
+                                       &act->key_id, act->typen, keystring);
                if (scan_cnt == 3) {
                        int len = strlen(keystring);
                        goodline = 1;   /* assume best for now */

diff --git a/sntp/crypto.h b/sntp/crypto.h
index e6a42ac498dbc592cd3977800d973c64b3349a31..961dca042a9f7f6da87ac5467731f9f92d8b6275 100644 (file)
--- a/sntp/crypto.h
+++ b/sntp/crypto.h
@@ -20,7 +20,8 @@ struct key {
        struct key *    next;
        int             key_id;
        int             key_len;
-       char            type[16];
+       int             typei;
+       char            typen[20];
        char            key_seq[64];
 };
 

diff --git a/sntp/tests/crypto.c b/sntp/tests/crypto.c
index 76fd955320ce0a95453302443effe2d2624a4c22..2525d89d00b559ec44a7f1984bc9dec7d054ba2c 100644 (file)
--- a/sntp/tests/crypto.c
+++ b/sntp/tests/crypto.c
@@ -96,7 +96,7 @@ test_MakeCMac(void)
        cmac.key_id = 30;
        cmac.key_len = CMAC_LENGTH;
        memcpy(&cmac.key_seq, "aes-128-cmac-seq", cmac.key_len);
-       memcpy(&cmac.type, CMAC, strlen(CMAC) + 1);
+       memcpy(&cmac.typen, CMAC, strlen(CMAC) + 1);
 
        TEST_ASSERT_EQUAL(CMAC_LENGTH,
                    make_mac(PKT_DATA, PKT_LEN, CMAC_LENGTH, &cmac, actual));
@@ -180,7 +180,7 @@ test_VerifyCMAC(void)
        cmac.key_id = 0;
        cmac.key_len = CMAC_LENGTH;
        memcpy(&cmac.key_seq, "aes-128-cmac-key", cmac.key_len);
-       memcpy(&cmac.type, CMAC, strlen(CMAC) + 1);
+       memcpy(&cmac.typen, CMAC, strlen(CMAC) + 1);
 
        TEST_ASSERT_TRUE(auth_md5(PKT_DATA, PKT_LEN, CMAC_LENGTH, &cmac));
        

diff --git a/sntp/tests/packetProcessing.c b/sntp/tests/packetProcessing.c
index a4a9055086913918cbd344513cd542bc9fc65575..910c561721c3339b57f9654aa16c1b7c348e6c20 100644 (file)
--- a/sntp/tests/packetProcessing.c
+++ b/sntp/tests/packetProcessing.c
@@ -80,7 +80,7 @@ PrepareAuthenticationTest(
        key_ptr->next = NULL;
        key_ptr->key_id = key_id;
        key_ptr->key_len = key_len;
-       memcpy(key_ptr->type, type, strlen(type) + 1);
+       memcpy(key_ptr->typen, type, strlen(type) + 1);
 
        TEST_ASSERT_TRUE(key_len < sizeof(key_ptr->key_seq));
 

diff --git a/sntp/tests/run-crypto.c b/sntp/tests/run-crypto.c
index 8b2a73528f4a85abf58ae21ac03dd3ce9b4bb938..ab7fb1ffcd0c876094a7a7343ac673453020e54c 100644 (file)
--- a/sntp/tests/run-crypto.c
+++ b/sntp/tests/run-crypto.c
@@ -32,8 +32,10 @@ extern void setUp(void);
 extern void tearDown(void);
 extern void test_MakeMd5Mac(void);
 extern void test_MakeSHA1Mac(void);
+extern void test_MakeCMac(void);
 extern void test_VerifyCorrectMD5(void);
 extern void test_VerifySHA1(void);
+extern void test_VerifyCMAC(void);
 extern void test_VerifyFailure(void);
 extern void test_PacketSizeNotMultipleOfFourBytes(void);
 
@@ -54,12 +56,14 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("crypto.c");
-  RUN_TEST(test_MakeMd5Mac, 12);
-  RUN_TEST(test_MakeSHA1Mac, 13);
-  RUN_TEST(test_VerifyCorrectMD5, 14);
-  RUN_TEST(test_VerifySHA1, 15);
-  RUN_TEST(test_VerifyFailure, 16);
-  RUN_TEST(test_PacketSizeNotMultipleOfFourBytes, 17);
+  RUN_TEST(test_MakeMd5Mac, 15);
+  RUN_TEST(test_MakeSHA1Mac, 16);
+  RUN_TEST(test_MakeCMac, 17);
+  RUN_TEST(test_VerifyCorrectMD5, 18);
+  RUN_TEST(test_VerifySHA1, 19);
+  RUN_TEST(test_VerifyCMAC, 20);
+  RUN_TEST(test_VerifyFailure, 21);
+  RUN_TEST(test_PacketSizeNotMultipleOfFourBytes, 22);
 
   return (UnityEnd());
 }

diff --git a/sntp/tests/run-packetProcessing.c b/sntp/tests/run-packetProcessing.c
index 38f855273c66bdd8bcf0e970a871afba9e597d22..54b35823253fb042e38b264405e54de9f2a77b59 100644 (file)
--- a/sntp/tests/run-packetProcessing.c
+++ b/sntp/tests/run-packetProcessing.c
@@ -48,6 +48,7 @@ extern void test_AcceptNoSentPacketBroadcastMode(void);
 extern void test_CorrectUnauthenticatedPacket(void);
 extern void test_CorrectAuthenticatedPacketMD5(void);
 extern void test_CorrectAuthenticatedPacketSHA1(void);
+extern void test_CorrectAuthenticatedPacketCMAC(void);
 
 
 //=======Test Reset Option=====
@@ -66,24 +67,25 @@ int main(int argc, char *argv[])
 {
   progname = argv[0];
   UnityBegin("packetProcessing.c");
-  RUN_TEST(test_TooShortLength, 20);
-  RUN_TEST(test_LengthNotMultipleOfFour, 21);
-  RUN_TEST(test_TooShortExtensionFieldLength, 22);
-  RUN_TEST(test_UnauthenticatedPacketReject, 23);
-  RUN_TEST(test_CryptoNAKPacketReject, 24);
-  RUN_TEST(test_AuthenticatedPacketInvalid, 25);
-  RUN_TEST(test_AuthenticatedPacketUnknownKey, 26);
-  RUN_TEST(test_ServerVersionTooOld, 27);
-  RUN_TEST(test_ServerVersionTooNew, 28);
-  RUN_TEST(test_NonWantedMode, 29);
-  RUN_TEST(test_KoDRate, 30);
-  RUN_TEST(test_KoDDeny, 31);
-  RUN_TEST(test_RejectUnsyncedServer, 32);
-  RUN_TEST(test_RejectWrongResponseServerMode, 33);
-  RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 34);
-  RUN_TEST(test_CorrectUnauthenticatedPacket, 35);
-  RUN_TEST(test_CorrectAuthenticatedPacketMD5, 36);
-  RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 37);
+  RUN_TEST(test_TooShortLength, 23);
+  RUN_TEST(test_LengthNotMultipleOfFour, 24);
+  RUN_TEST(test_TooShortExtensionFieldLength, 25);
+  RUN_TEST(test_UnauthenticatedPacketReject, 26);
+  RUN_TEST(test_CryptoNAKPacketReject, 27);
+  RUN_TEST(test_AuthenticatedPacketInvalid, 28);
+  RUN_TEST(test_AuthenticatedPacketUnknownKey, 29);
+  RUN_TEST(test_ServerVersionTooOld, 30);
+  RUN_TEST(test_ServerVersionTooNew, 31);
+  RUN_TEST(test_NonWantedMode, 32);
+  RUN_TEST(test_KoDRate, 33);
+  RUN_TEST(test_KoDDeny, 34);
+  RUN_TEST(test_RejectUnsyncedServer, 35);
+  RUN_TEST(test_RejectWrongResponseServerMode, 36);
+  RUN_TEST(test_AcceptNoSentPacketBroadcastMode, 37);
+  RUN_TEST(test_CorrectUnauthenticatedPacket, 38);
+  RUN_TEST(test_CorrectAuthenticatedPacketMD5, 39);
+  RUN_TEST(test_CorrectAuthenticatedPacketSHA1, 40);
+  RUN_TEST(test_CorrectAuthenticatedPacketCMAC, 41);
 
   return (UnityEnd());
 }