[Git][NTPsec/ntpsec][master] Init cookie count to -1, drop per-cookie valid flag

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
0156768e by Hal Murray at 2019-02-20T06:54:27Z
Init cookie count to -1, drop per-cookie valid flag

- - - - -


3 changed files:

- include/nts.h
- ntpd/ntp_peer.c
- ntpd/nts_client.c


Changes:

=====================================
include/nts.h
=====================================
@@ -44,9 +44,8 @@ struct ntsclient_t {
     uint8_t UID[NTS_UID_LENGTH];
     /* cookies */
     int readIdx, writeIdx;
-    int count;
+    int count;			/* -1 if not in NTS mode */
     int cookielen;
-    bool valid[NTS_MAX_COOKIES];
     uint8_t cookies[NTS_MAX_COOKIES][NTS_MAX_COOKIELEN];
 };
 


=====================================
ntpd/ntp_peer.c
=====================================
@@ -629,6 +629,9 @@ newpeer(
 	 */
 	memcpy(&peer->cfg, ctl, sizeof(peer->cfg));
 
+	/* reset NTS */
+	peer->nts_state.count = -1;
+
 	peer->cast_flags = cast_flags;
 	set_peerdstadr(peer,
 		       select_peerinterface(peer, srcadr, dstadr));


=====================================
ntpd/nts_client.c
=====================================
@@ -311,7 +311,6 @@ bool nts_client_process_response(struct peer* peer, SSL *ssl) {
   peer->nts_state.writeIdx = 0;
   peer->nts_state.readIdx = 0;
   peer->nts_state.count = 0;
-  for (int i=0; i<NTS_MAX_COOKIES; i++) peer->nts_state.valid[i] = false;
 
   buf.next = buff;
   buf.left = transfered;
@@ -369,7 +368,6 @@ bool nts_client_process_response(struct peer* peer, SSL *ssl) {
           break;
         }
         nts_next_bytes(&buf, (uint8_t*)&peer->nts_state.cookies[idx], length);
-        peer->nts_state.valid[idx] = true;
         peer->nts_state.writeIdx++;
         peer->nts_state.writeIdx = peer->nts_state.writeIdx % NTS_MAX_COOKIES;
         peer->nts_state.count++;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/0156768e769e4ac8cd758fe8929df3118fbfee3a

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/0156768e769e4ac8cd758fe8929df3118fbfee3a
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20190220/1c142f0b/attachment-0001.html>