Skip to content

Commit 7afb941

Browse files
rnijveldrnijveld
committed
Release 1.1.3
1 parent 6049687 commit 7afb941

11 files changed

+210
-286
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## [1.1.3] - 2024-06-28
4+
5+
### Fixed
6+
- Unlimited number of NTS-KE connections could crash ntpd-rs server (CVE-2024-38528)
7+
38
## [1.1.2] - 2024-02-01
49

510
### Fixed
@@ -188,6 +193,7 @@ process.
188193
- Fixed a bug in peer dispersion calculation which resulted in overly
189194
pessimistic dispersion estimates.
190195

196+
[1.1.3]: https://github.com/pendulum-project/ntpd-rs/compare/v1.1.2...v1.1.3
191197
[1.1.2]: https://github.com/pendulum-project/ntpd-rs/compare/v1.1.1...v1.1.2
192198
[1.1.1]: https://github.com/pendulum-project/ntpd-rs/compare/v1.1.0...v1.1.1
193199
[1.1.0]: https://github.com/pendulum-project/ntpd-rs/compare/v1.0.0...v1.1.0

‎Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resolver = "2"
1414

1515
# Global settings for our crates
1616
[workspace.package]
17-
version = "1.1.2"
17+
version = "1.1.3"
1818
edition = "2021"
1919
license = "Apache-2.0 OR MIT"
2020
repository = "https://github.com/pendulum-project/ntpd-rs"
@@ -61,6 +61,6 @@ zeroize = "1.5"
6161

6262
# our own crates used as dependencies, same version as the workspace version
6363
# NOTE: keep this part at the bottom of the file, do not change this line
64-
ntp-os-clock = { version = "1.1.2", path = "./ntp-os-clock" }
65-
ntp-proto = { version = "1.1.2", path = "./ntp-proto", features = ["__internal-api"] }
66-
ntp-udp = { version = "1.1.2", path = "./ntp-udp" }
64+
ntp-os-clock = { version = "1.1.3", path = "./ntp-os-clock" }
65+
ntp-proto = { version = "1.1.3", path = "./ntp-proto", features = ["__internal-api"] }
66+
ntp-udp = { version = "1.1.3", path = "./ntp-udp" }

‎docs/man/ntp-ctl.8.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- ---
2-
title: NTP-CTL(8) ntpd-rs 1.1.2 | ntpd-rs
2+
title: NTP-CTL(8) ntpd-rs 1.1.3 | ntpd-rs
33
--- -->
44

55
# NAME

‎docs/man/ntp-daemon.8.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- ---
2-
title: NTP-DAEMON(8) ntpd-rs 1.1.2 | ntpd-rs
2+
title: NTP-DAEMON(8) ntpd-rs 1.1.3 | ntpd-rs
33
--- -->
44

55
# NAME

‎docs/man/ntp-metrics-exporter.8.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- ---
2-
title: NTP-METRICS-EXPORTER(8) ntpd-rs 1.1.2 | ntpd-rs
2+
title: NTP-METRICS-EXPORTER(8) ntpd-rs 1.1.3 | ntpd-rs
33
--- -->
44

55
# NAME

‎docs/man/ntp.toml.5.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- ---
2-
title: NTP.TOML(5) ntpd-rs 1.1.2 | ntpd-rs
2+
title: NTP.TOML(5) ntpd-rs 1.1.3 | ntpd-rs
33
--- -->
44

55
# NAME

‎docs/precompiled/man/ntp-ctl.8

Lines changed: 21 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,56 @@
1-
.\" Automatically generated by Pandoc 3.1.1
1+
.\" Automatically generated by Pandoc 3.1.13
22
.\"
3-
.\" Define V font for inline verbatim, using C font in formats
4-
.\" that render this, and otherwise B font.
5-
.ie "\f[CB]x\f[]"x" \{\
6-
. ftr V B
7-
. ftr VI BI
8-
. ftr VB B
9-
. ftr VBI BI
10-
.\}
11-
.el \{\
12-
. ftr V CR
13-
. ftr VI CI
14-
. ftr VB CB
15-
. ftr VBI CBI
16-
.\}
17-
.TH "NTP-CTL" "8" "" "ntpd-rs 1.1.2" "ntpd-rs"
18-
.hy
3+
.TH "NTP\-CTL" "8" "" "ntpd\-rs 1.1.3" "ntpd\-rs"
194
.SH NAME
20-
.PP
21-
\f[V]ntp-ctl\f[R] - management client for the ntpd-rs ntp-daemon process
5+
\f[CR]ntp\-ctl\f[R] \- management client for the ntpd\-rs ntp\-daemon
6+
process
227
.SH SYNOPSIS
23-
.PP
24-
\f[V]ntp-ctl\f[R] validate [\f[V]-c\f[R] \f[I]path\f[R]]
8+
\f[CR]ntp\-ctl\f[R] validate [\f[CR]\-c\f[R] \f[I]path\f[R]]
259
.PD 0
2610
.P
2711
.PD
28-
\f[V]ntp-ctl\f[R] status [\f[V]-f\f[R] \f[I]format\f[R]] [\f[V]-c\f[R]
29-
\f[I]path\f[R]]
12+
\f[CR]ntp\-ctl\f[R] status [\f[CR]\-f\f[R] \f[I]format\f[R]]
13+
[\f[CR]\-c\f[R] \f[I]path\f[R]]
3014
.PD 0
3115
.P
3216
.PD
33-
\f[V]ntp-ctl\f[R] \f[V]-h\f[R]
17+
\f[CR]ntp\-ctl\f[R] \f[CR]\-h\f[R]
3418
.PD 0
3519
.P
3620
.PD
37-
\f[V]ntp-ctl\f[R] \f[V]-v\f[R]
21+
\f[CR]ntp\-ctl\f[R] \f[CR]\-v\f[R]
3822
.SH DESCRIPTION
39-
.PP
40-
The \f[V]ntp-ctl\f[R] management client allows management of some
41-
aspects of the ntpd-rs daemon.
23+
The \f[CR]ntp\-ctl\f[R] management client allows management of some
24+
aspects of the ntpd\-rs daemon.
4225
Currently the management client only allows displaying the current
4326
status of the daemon and validating a configuration file for usage with
4427
the daemon.
4528
.SH OPTIONS
4629
.TP
47-
\f[V]-c\f[R] \f[I]path\f[R], \f[V]--config\f[R]=\f[I]path\f[R]
30+
\f[CR]\-c\f[R] \f[I]path\f[R], \f[CR]\-\-config\f[R]=\f[I]path\f[R]
4831
Path to the configuration file from which the observation socket address
4932
will be retrieved.
50-
If not specified this defaults to \f[V]/etc/ntpd-rs/ntp.toml\f[R].
33+
If not specified this defaults to \f[CR]/etc/ntpd\-rs/ntp.toml\f[R].
5134
.TP
52-
\f[V]-f\f[R] \f[I]format\f[R], \f[V]--format\f[R]=\f[I]format\f[R]
35+
\f[CR]\-f\f[R] \f[I]format\f[R], \f[CR]\-\-format\f[R]=\f[I]format\f[R]
5336
The output format for the status command.
5437
If not specified this defaults to \f[I]plain\f[R].
5538
Alternatively the format \f[I]prometheus\f[R] is available to display
5639
the output in an OpenMetrics/Prometheus compatible format.
5740
.TP
58-
\f[V]-h\f[R], \f[V]--help\f[R]
41+
\f[CR]\-h\f[R], \f[CR]\-\-help\f[R]
5942
Display usage instructions.
6043
.TP
61-
\f[V]-v\f[R], \f[V]--version\f[R]
44+
\f[CR]\-v\f[R], \f[CR]\-\-version\f[R]
6245
Display version information.
6346
.SH COMMANDS
6447
.TP
65-
\f[V]validate\f[R]
48+
\f[CR]validate\f[R]
6649
Checks if the configuration specified (or
67-
\f[V]/etc/ntpd-rs/ntp.toml\f[R] by default) is valid.
50+
\f[CR]/etc/ntpd\-rs/ntp.toml\f[R] by default) is valid.
6851
.TP
69-
\f[V]status\f[R]
70-
Returns status information about the current state of the ntp-daemon
52+
\f[CR]status\f[R]
53+
Returns status information about the current state of the ntp\-daemon
7154
that the client connects to.
7255
.SH SEE ALSO
73-
.PP
74-
ntp-daemon(8), ntp-metrics-exporter(8), ntp.toml(5)
56+
ntp\-daemon(8), ntp\-metrics\-exporter(8), ntp.toml(5)

‎docs/precompiled/man/ntp-daemon.8

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,49 @@
1-
.\" Automatically generated by Pandoc 3.1.1
1+
.\" Automatically generated by Pandoc 3.1.13
22
.\"
3-
.\" Define V font for inline verbatim, using C font in formats
4-
.\" that render this, and otherwise B font.
5-
.ie "\f[CB]x\f[]"x" \{\
6-
. ftr V B
7-
. ftr VI BI
8-
. ftr VB B
9-
. ftr VBI BI
10-
.\}
11-
.el \{\
12-
. ftr V CR
13-
. ftr VI CI
14-
. ftr VB CB
15-
. ftr VBI CBI
16-
.\}
17-
.TH "NTP-DAEMON" "8" "" "ntpd-rs 1.1.2" "ntpd-rs"
18-
.hy
3+
.TH "NTP\-DAEMON" "8" "" "ntpd\-rs 1.1.3" "ntpd\-rs"
194
.SH NAME
20-
.PP
21-
\f[V]ntp-daemon\f[R] - ntpd-rs Network Time Protocol service daemon
5+
\f[CR]ntp\-daemon\f[R] \- ntpd\-rs Network Time Protocol service daemon
226
.SH SYNOPSIS
23-
.PP
24-
\f[V]ntp-daemon\f[R] [\f[V]-c\f[R] \f[I]path\f[R]] [\f[V]-l\f[R]
7+
\f[CR]ntp\-daemon\f[R] [\f[CR]\-c\f[R] \f[I]path\f[R]] [\f[CR]\-l\f[R]
258
\f[I]loglevel\f[R]]
269
.PD 0
2710
.P
2811
.PD
29-
\f[V]ntp-daemon\f[R] \f[V]-h\f[R]
12+
\f[CR]ntp\-daemon\f[R] \f[CR]\-h\f[R]
3013
.PD 0
3114
.P
3215
.PD
33-
\f[V]ntp-daemon\f[R] \f[V]-v\f[R]
16+
\f[CR]ntp\-daemon\f[R] \f[CR]\-v\f[R]
3417
.SH DESCRIPTION
35-
.PP
36-
\f[V]ntp-daemon\f[R] is the Network Time Protocol (NTP) service daemon
37-
for ntpd-rs, an NTP implementation with a focus on security and
18+
\f[CR]ntp\-daemon\f[R] is the Network Time Protocol (NTP) service daemon
19+
for ntpd\-rs, an NTP implementation with a focus on security and
3820
stability.
39-
The \f[V]ntp-deamon\f[R] can be configured as both an NTP client and an
40-
NTP server.
21+
The \f[CR]ntp\-deamon\f[R] can be configured as both an NTP client and
22+
an NTP server.
4123
The daemon also works with the Network Time Security (NTS) protocol.
4224
Details of the configuration of the daemon and implementation details
43-
can be found in ntp.toml(5), where several concepts of the ntp-daemon
25+
can be found in ntp.toml(5), where several concepts of the ntp\-daemon
4426
are also explained.
4527
.SH OPTIONS
4628
.TP
47-
\f[V]-c\f[R] \f[I]path\f[R], \f[V]--config\f[R]=\f[I]path\f[R]
48-
The configuration file path for the ntp-daemon where settings for the
49-
configuration of ntpd-rs are stored.
29+
\f[CR]\-c\f[R] \f[I]path\f[R], \f[CR]\-\-config\f[R]=\f[I]path\f[R]
30+
The configuration file path for the ntp\-daemon where settings for the
31+
configuration of ntpd\-rs are stored.
5032
If not specified the default configuration file is
51-
\f[V]/etc/ntpd-rs/ntp.toml\f[R].
33+
\f[CR]/etc/ntpd\-rs/ntp.toml\f[R].
5234
.TP
53-
\f[V]-h\f[R], \f[V]--help\f[R]
35+
\f[CR]\-h\f[R], \f[CR]\-\-help\f[R]
5436
Display usage instructions.
5537
.TP
56-
\f[V]-l\f[R] \f[I]loglevel\f[R], \f[V]--log-level\f[R]=\f[I]loglevel\f[R]
38+
\f[CR]\-l\f[R] \f[I]loglevel\f[R], \f[CR]\-\-log\-level\f[R]=\f[I]loglevel\f[R]
5739
Change which log messages are logged to stdout.
5840
Available log levels are \f[I]trace\f[R], \f[I]debug\f[R],
5941
\f[I]info\f[R], \f[I]warn\f[R] and \f[I]error\f[R] (from lower to higher
6042
priority).
6143
Only messages with the given priority and higher will be displayed.
6244
The default log level is \f[I]info\f[R].
6345
.TP
64-
\f[V]-v\f[R], \f[V]--version\f[R]
46+
\f[CR]\-v\f[R], \f[CR]\-\-version\f[R]
6547
Display version information.
6648
.SH SEE ALSO
67-
.PP
68-
ntp-ctl(8), ntp-metrics-exporter(8), ntp.toml(5)
49+
ntp\-ctl(8), ntp\-metrics\-exporter(8), ntp.toml(5)

‎docs/precompiled/man/ntp-metrics-exporter.8

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,33 @@
1-
.\" Automatically generated by Pandoc 3.1.1
1+
.\" Automatically generated by Pandoc 3.1.13
22
.\"
3-
.\" Define V font for inline verbatim, using C font in formats
4-
.\" that render this, and otherwise B font.
5-
.ie "\f[CB]x\f[]"x" \{\
6-
. ftr V B
7-
. ftr VI BI
8-
. ftr VB B
9-
. ftr VBI BI
10-
.\}
11-
.el \{\
12-
. ftr V CR
13-
. ftr VI CI
14-
. ftr VB CB
15-
. ftr VBI CBI
16-
.\}
17-
.TH "NTP-METRICS-EXPORTER" "8" "" "ntpd-rs 1.1.2" "ntpd-rs"
18-
.hy
3+
.TH "NTP\-METRICS\-EXPORTER" "8" "" "ntpd\-rs 1.1.3" "ntpd\-rs"
194
.SH NAME
20-
.PP
21-
\f[V]ntp-metrics-exporter\f[R] - Prometheus/OpenMetrics exporter for the
22-
ntpd-rs daemon
5+
\f[CR]ntp\-metrics\-exporter\f[R] \- Prometheus/OpenMetrics exporter for
6+
the ntpd\-rs daemon
237
.SH SYNOPSIS
24-
.PP
25-
\f[V]ntp-metrics-exporter\f[R] [\f[V]-c\f[R] \f[I]path\f[R]]
8+
\f[CR]ntp\-metrics\-exporter\f[R] [\f[CR]\-c\f[R] \f[I]path\f[R]]
269
.PD 0
2710
.P
2811
.PD
29-
\f[V]ntp-metrics-exporter\f[R] \f[V]-h\f[R]
12+
\f[CR]ntp\-metrics\-exporter\f[R] \f[CR]\-h\f[R]
3013
.PD 0
3114
.P
3215
.PD
33-
\f[V]ntp-metrics-exporter\f[R] \f[V]-v\f[R]
16+
\f[CR]ntp\-metrics\-exporter\f[R] \f[CR]\-v\f[R]
3417
.SH DESCRIPTION
35-
.PP
36-
Exports the status metrics from the ntpd-rs daemon as
18+
Exports the status metrics from the ntpd\-rs daemon as
3719
Prometheus/OpenMetrics via an HTTP socket.
3820
.SH OPTIONS
3921
.TP
40-
\f[V]-c\f[R] \f[I]path\f[R], \f[V]--config\f[R]=\f[I]path\f[R]
22+
\f[CR]\-c\f[R] \f[I]path\f[R], \f[CR]\-\-config\f[R]=\f[I]path\f[R]
4123
Path to the configuration file where the observation socket path for
42-
connecting with the ntp-daemon is specified.
43-
This defaults to \f[V]/etc/ntpd-rs/ntp.toml\f[R] if not specified.
24+
connecting with the ntp\-daemon is specified.
25+
This defaults to \f[CR]/etc/ntpd\-rs/ntp.toml\f[R] if not specified.
4426
.TP
45-
\f[V]-h\f[R], \f[V]--help\f[R]
27+
\f[CR]\-h\f[R], \f[CR]\-\-help\f[R]
4628
Display usage instructions.
4729
.TP
48-
\f[V]-v\f[R], \f[V]--version\f[R]
30+
\f[CR]\-v\f[R], \f[CR]\-\-version\f[R]
4931
Display version information.
5032
.SH SEE ALSO
51-
.PP
52-
ntp-daemon(8), ntp-ctl(8), ntp.toml(5)
33+
ntp\-daemon(8), ntp\-ctl(8), ntp.toml(5)

0 commit comments

Comments
 (0)