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

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

bk: 5f8eb2b24ccKGEzJN14OJGMPNfvzZA

diff --cc ChangeLog
index 6aaec9ec9dc16ebe6de30508cdeec5db8c819c2c,7bb391137542e3e3ce8768dc4bd9b1c8730f37f6..d48daef6bd948d870a6fda817667c9ad66343b53
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,8 +1,18 @@@
  ---
 +
+ * [Bug 3689] Extension for MD5, SHA-1 and other keys <perlinger@ntp.org>
+   - ntp{q,dc} now use the same password processing as ntpd does in the key
+     file, so havin a binary secret >= 11 bytes is possible for all keys.
+     (This is a different approach to the roblem than suggested)
 +* [Bug 3688] GCC 10 build errors in testsuite <perlinger@ntp.org>
 +* [Bug 3676] compiler warnings (CMAC, interrupt_buf, typo, fallthrough)
 +  - applied patches by Gerry Garvey
 +* [Bug 3675] ntpq ccmds[] stores pointer to non-persistent storage
 +* [Bug 3672] fix biased selection in median cut <perlinger@ntp.org>
 +* [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
 +  - follow-up: fix inverted sense in check, reset shortfall counter
 +* [Bug 3626] (SNTP) UTC offset calculation needs dst flag <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
  
  ---
  (4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.org>