From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 18 Jan 2009 00:08:44 +0000 (-0500)
Subject: Design assertion fixes for ntp_crypto.c from Dave Mills
X-Git-Tag: NTP_4_2_5P155~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f9458fb4173423a3a8c3aaa5b1a15fd985cb811;p=thirdparty%2Fntp.git

Design assertion fixes for ntp_crypto.c from Dave Mills

bk: 4972730cy6sQEXfcvJ60-e1Kgcp-5A
---

diff --git a/ChangeLog b/ChangeLog
index 98c6aa224..379adc7dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Design assertion fixes for ntp_crypto.c from Dave Mills.
 (4.2.5p154) 2009/01/13 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 992] support interface event change on Linux from
   Miroslav Lichvar.
diff --git a/ntpd/ntp_crypto.c b/ntpd/ntp_crypto.c
index 739531b0b..a0868818f 100644
--- a/ntpd/ntp_crypto.c
+++ b/ntpd/ntp_crypto.c
@@ -687,8 +687,7 @@ crypto_recv(
 			if ((rval = crypto_iff(ep, peer)) != XEVNT_OK)
 				break;
 
-			peer->crypto |= CRYPTO_FLAG_VRFY |
-			    CRYPTO_FLAG_PROV;
+			peer->crypto |= CRYPTO_FLAG_VRFY;
 			peer->flash &= ~TEST8;
 			snprintf(statstr, NTP_MAXSTRLEN, "iff %s fs %u",
 			    peer->issuer, ntohl(ep->fstamp));
@@ -729,8 +728,7 @@ crypto_recv(
 			if ((rval = crypto_gq(ep, peer)) != XEVNT_OK)
 				break;
 
-			peer->crypto |= CRYPTO_FLAG_VRFY |
-			    CRYPTO_FLAG_PROV;
+			peer->crypto |= CRYPTO_FLAG_VRFY;
 			peer->flash &= ~TEST8;
 			snprintf(statstr, NTP_MAXSTRLEN, "gq %s fs %u",
 			    peer->issuer, ntohl(ep->fstamp));
@@ -770,8 +768,7 @@ crypto_recv(
 			if ((rval = crypto_mv(ep, peer)) != XEVNT_OK)
 				break;
 
-			peer->crypto |= CRYPTO_FLAG_VRFY |
-			    CRYPTO_FLAG_PROV;
+			peer->crypto |= CRYPTO_FLAG_VRFY;
 			peer->flash &= ~TEST8;
 			snprintf(statstr, NTP_MAXSTRLEN, "mv %s fs %u",
 			    peer->issuer, ntohl(ep->fstamp));