From: Dave Hart <hart@ntp.org>
Date: Wed, 15 Dec 2010 08:27:35 +0000 (+0000)
Subject: [Bug 1618] Unreachable code in jjy_start(). (backport from ntp-dev)
X-Git-Tag: NTP_4_2_7P94~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6297d67b2df3e0ee48105cb285778572b8765dc4;p=thirdparty%2Fntp.git

[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 bed7f2f47..8aa477ce0 100644
--- 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 dd6b6549e..aad592a53 100644
--- 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);
 
 	/*