Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

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

bk: 5a31a6ablRotMlf2Qy3KL6FQpul4Sw

diff --cc ChangeLog
index dca3d0013a462de4e04e41b9e123ec0c15906e68,bfa645b8681e1dd45f377437a8b0f5250bb7f856..6477649271c10a56437858f1964e768337db74e7
--- 1/ChangeLog
--- 2/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 libntp/authreadkeys.c
Simple merge

diff --cc sntp/crypto.c
index 1af6dabd3e6735f4dd2ec8c5d94c73ebc5f83a6b,fd2c251670caa5c6a59202bcd36b875650280d48..43d7efebed9ee62158b2eb23b8b7f04d2950a841
--- 1/sntp/crypto.c
--- 2/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];