From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 13 Dec 2017 22:16:11 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83ebeb212bcaed3f5f2b1858f6223761a54a330d;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac

bk: 5a31a6ablRotMlf2Qy3KL6FQpul4Sw
---

83ebeb212bcaed3f5f2b1858f6223761a54a330d
diff --cc ChangeLog
index dca3d0013,bfa645b86..647764927
--- a/ChangeLog
+++ b/ChangeLog
@@@ -53,7 -51,8 +54,9 @@@
  * Build ntpq and libntpq.a with NTP_HARD_*FLAGS.  perlinger@ntp.org
  * Fix bug in the override portion of the compiler hardening macro. HStenn.
  * record_raw_stats(): Log entire packet.  Log writes.  HStenn.
 +* AES-128-CMAC support.  BInglis, HStenn, JPerlinger.
+ * sntp: tweak key file logging.  HStenn.
+ * sntp: pkt_output(): Improve debug output.  HStenn.
  
  ---
  (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
diff --cc sntp/crypto.c
index 1af6dabd3,fd2c25167..43d7efebe
--- a/sntp/crypto.c
+++ b/sntp/crypto.c
@@@ -192,9 -106,9 +192,9 @@@ auth_init
  	struct key **keys
  	)
  {
 -	FILE *keyf = fopen(keyfile, "r"); 
 +	FILE *keyf = fopen(keyfile, "r");
  	struct key *prev = NULL;
- 	int scan_cnt, line_cnt = 0;
+ 	int scan_cnt, line_cnt = 1;
  	char kbuf[200];
  	char keystring[129];