From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 28 Nov 2017 07:08:28 +0000 (-0800)
Subject: Merge stenn@psp-deb1.ntp.org:ntp-stable-aes128cmac
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eed956d430fe9bdf25e5a25561dc809d4b9f7c0;p=thirdparty%2Fntp.git

Merge stenn@psp-deb1.ntp.org:ntp-stable-aes128cmac
into  mb6.tal1.ntfo.org:/home/harlan/src/ntp-stable-aes128cmac

bk: 5a1d0b6c6zU3VPIKeO4UYhn1TAjbGQ
---

6eed956d430fe9bdf25e5a25561dc809d4b9f7c0
diff --cc sntp/crypto.c
index 4335629bb,3f3f310b8..63025ba6d
--- a/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 a3df1170b,2525d89d0..721e35771
--- a/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