Merge stenn@psp-deb1.ntp.org:ntp-stable-aes128cmac

into  mb6.tal1.ntfo.org:/home/harlan/src/ntp-stable-aes128cmac

bk: 5a1d0b6c6zU3VPIKeO4UYhn1TAjbGQ

diff --cc sntp/crypto.c
index 4335629bb1ceee1e013af0d0729d9c72e86b28b2,3f3f310b80f7eafb3b4f84ba5a92006e15b8c768..63025ba6d5e6b0c728c6d9107729f767437647cd
--- 1/sntp/crypto.c
--- 2/sntp/crypto.c
+++ b/sntp/crypto.c
@@@ -39,8 -30,9 +39,8 @@@ 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 */
        if (key_type == NID_cmac) {
            CMAC_CTX *      ctx;

diff --cc sntp/tests/crypto.c
index a3df1170b861f73e78c0c74ea696d516824111b7,2525d89d00b559ec44a7f1984bc9dec7d054ba2c..721e357710e64ff6cfea907915dc8711e86ab532
--- 1/sntp/tests/crypto.c
--- 2/sntp/tests/crypto.c
+++ b/sntp/tests/crypto.c
@@@ -178,20 -180,9 +178,20 @@@ 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));
 +      test_VerifyOpenSSLCMAC(&cmac)
 +      test_VerifyLocalCMAC(&cmac)
 +}
 +
 +
 +void
 +test_VerifyOpenSSLCMAC(struct key *cmac)
 +{
 +#ifdef OPENSSL
 +
 +      /* XXX: HMS: auth_md5 must be renamed/incorrect. */
 +      TEST_ASSERT_TRUE(auth_md5(PKT_DATA, PKT_LEN, CMAC_LENGTH, cmac));
        
  #else