[Bug 1618] Unreachable code in jjy_start(). (backport from ntp-dev)

  (applies to -stable changes previously pulled to -dev only)
[Bug 1719] ntp-keygen -V crash. (backport)

bk: 4d087bf7gIJXhI8ZjXE8utNZxtBmMQ

diff --git a/ChangeLog b/ChangeLog
index bed7f2f47a52aeaecda46d6169a5beefed47adeb..8aa477ce056db22e21a6105514189476286c0a9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 ---
 
 * [Bug 1510] Add modes 20/21 for driver 8 to support RAWDCF @ 75 baud.
+* [Bug 1618] Unreachable code in jjy_start(). (backport from ntp-dev)
+* [Bug 1719] ntp-keygen -V crash. (backport)
 * [Bug 1741] Enable multicast reception on each address (Windows).
 * [Bug 1742] Fix a typo in an error message in the "build" script.
 * [Bug 1743] Display timezone offset when showing time for sntp in the

diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c
index dd6b6549e301a23b8e5d6127e35dbd275047afd5..aad592a53c8313670a744ca3a76d1fcbbb6633e1 100644 (file)
--- a/util/ntp-keygen.c
+++ b/util/ntp-keygen.c
@@ -1646,7 +1646,6 @@ gen_mvkey(
        s = BN_new();
 
        BN_copy(s, dsa->q);
-       BN_div(s, u, s, s1[10], ctx);
        BN_div(s, u, s, s1[n], ctx);
 
        /*