Yo Eric!
+nts+::
Use Network Time Security for authentication and encryption.
- Request key exchange from the NTP server.
+ Request key exchange from the NTP server. Following options
+ are revelevant only for nts peers, and are thus tagged with 'nts'.
+ that can be omitted when the option is given.
That is just confusing. Dispensing with the nts keyword makes it
hard to tell what is going on...
And you'll need to tag the other keywords that do not apply, and the
options that changed their meaning.
RGDS
GARY
---------------------------------------------------------------------------
Gary E. Miller Rellim 109 NW Wilmington Ave., Suite E, Bend, OR 97703
g...@rellim.com Tel:+1 541 382 8588
Veritas liberabit vos. -- Quid est veritas?
"If you can’t measure it, you can’t improve it." - Lord Kelvin
Title:
GitLab
Eric S. Raymond pushed to branch master
at NTPsec / ntpsec
Commits:
5 changed files:
Changes:
docs/includes/assoc-options.adoc
... |
... |
@@ -74,14 +74,23 @@ |
74
|
74
|
|
75
|
75
|
+nts+::
|
76
|
76
|
Use Network Time Security for authentication and encryption.
|
77
|
|
- Request key exchange from the NTP server.
|
|
77
|
+ Request key exchange from the NTP server. Following options
|
|
78
|
+ are revelevant only for nts peers, and are thus tagged with 'nts'.
|
|
79
|
+ that can be omitted when the option is given.
|
78
|
80
|
|
79
|
|
-+nts ask+ 'servername'::
|
|
81
|
++nts ask+ 'address'::
|
80
|
82
|
Use Network Time Security for authentication and encryption.
|
81
|
83
|
Ask for a specific NTS server, which may differ from the NTP server.
|
|
84
|
+ The +address_ may be a hostname, a FQDN, an IPv4 numeric address, an
|
|
85
|
+ IPv6 numeric addresa (in square brackets). Address may have the suffix
|
|
86
|
+ +:port+ to specify a UDP port.
|
82
|
87
|
|
83
|
|
-+nts require+ 'servername'::
|
|
88
|
++nts require+ 'address'::
|
84
|
89
|
Use Network Time Security for authentication and encryption.
|
85
|
90
|
Require a specific NTS server, which may differ from the NTP server.
|
|
91
|
+ Address syntax is as for +ask+.
|
|
92
|
+
|
|
93
|
++nts noval::
|
|
94
|
+ Do not validate the server certificate.
|
86
|
95
|
|
87
|
96
|
// end
|
include/nts.h
... |
... |
@@ -10,6 +10,7 @@ |
10
|
10
|
#define FLAG_NTS 0x01u /* use NTS (network time security) */
|
11
|
11
|
#define FLAG_NTS_ASK 0x02u /* NTS, ask for specified server */
|
12
|
12
|
#define FLAG_NTS_REQ 0x04u /* NTS, ask for specified server */
|
|
13
|
+#define FLAG_NTS_NOVAL 0x08u /* do not validate the server certificate */
|
13
|
14
|
|
14
|
15
|
/* Configuration data for an NTS association */
|
15
|
16
|
struct ntscfg_t {
|
ntpd/keyword-gen.c
... |
... |
@@ -199,6 +199,7 @@ struct key_tok ntp_keywords[] = { |
199
|
199
|
{ "nts", T_Nts, FOLLBY_TOKEN },
|
200
|
200
|
{ "ask", T_Ask, FOLLBY_STRING },
|
201
|
201
|
{ "require", T_Require, FOLLBY_STRING },
|
|
202
|
+{ "noval", T_Noval, FOLLBY_TOKEN },
|
202
|
203
|
};
|
203
|
204
|
|
204
|
205
|
typedef struct big_scan_state_tag {
|
ntpd/ntp_config.c
... |
... |
@@ -628,6 +628,10 @@ create_peer_node( |
628
|
628
|
my_node->ctl.flags |= FLAG_NOSELECT;
|
629
|
629
|
break;
|
630
|
630
|
|
|
631
|
+ case T_Noval:
|
|
632
|
+ my_node->ctl.nts_cfg.flags |= FLAG_NTS_NOVAL;
|
|
633
|
+ break;
|
|
634
|
+
|
631
|
635
|
case T_Nts:
|
632
|
636
|
my_node->ctl.nts_cfg.flags |= FLAG_NTS;
|
633
|
637
|
break;
|
ntpd/ntp_parser.y
... |
... |
@@ -155,6 +155,7 @@ |
155
|
155
|
%token <Integer> T_Noserve
|
156
|
156
|
%token <Integer> T_Notrap
|
157
|
157
|
%token <Integer> T_Notrust
|
|
158
|
+%token <Integer> T_Noval
|
158
|
159
|
%token <Integer> T_Ntp
|
159
|
160
|
%token <Integer> T_Ntpport
|
160
|
161
|
%token <Integer> T_NtpSignDsocket
|
... |
... |
@@ -405,6 +406,7 @@ option_flag_keyword |
405
|
406
|
: T_Burst
|
406
|
407
|
| T_Iburst
|
407
|
408
|
| T_Noselect
|
|
409
|
+ | T_Noval
|
408
|
410
|
| T_Nts
|
409
|
411
|
| T_Prefer
|
410
|
412
|
| T_True
|
_______________________________________________
vc mailing list
v...@ntpsec.org
http://lists.ntpsec.org/mailman/listinfo/vc
pgpJF1f6RM5iJ.pgp
Description: OpenPGP digital signature
_______________________________________________
devel mailing list
devel@ntpsec.org
http://lists.ntpsec.org/mailman/listinfo/devel