Design assertion fixes for ntp_crypto.c from Dave Mills

bk: 4972730cy6sQEXfcvJ60-e1Kgcp-5A

diff --git a/ChangeLog b/ChangeLog
index 98c6aa224fce341adaf3fcaa0dcb8916120345d9..379adc7dce093c3f485e2d4738129e383a747b93 100644 (file)
--- 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 739531b0b6dbc0232c3982e9a8ae1e505e2c7ac7..a0868818feacd57308e635f8d12e5603c074e908 100644 (file)
--- 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));