mirror of
https://github.com/jmcorgan/fips.git
synced 2026-10-06 11:38:24 +00:00
Merge master into next, carrying two fixes from fr34aky
The invalid-hostname test resolves an absolute name and the FreeBSD package README uses version placeholders. Both come from maint through master and apply to next unchanged.
This commit is contained in:
@@ -18,13 +18,14 @@ not compiled pending FreeBSD-specific `SO_REUSEPORT` validation.
|
||||
./packaging/freebsd/build-pkg.sh --no-build # package existing release binaries
|
||||
```
|
||||
|
||||
Output: `deploy/fips-<version>-freebsd-<arch>.pkg` (e.g.
|
||||
`fips-0.5.1.dev-freebsd-amd64.pkg` — pkg versions cannot contain `-`).
|
||||
Output: `deploy/fips-<version>-freebsd-<arch>.pkg`. pkg versions cannot
|
||||
contain `-` or `+`, so both are mapped to `.`: a Cargo version of
|
||||
`<x.y.z>-dev` becomes `fips-<x.y.z>.dev-freebsd-amd64.pkg`.
|
||||
|
||||
## Install
|
||||
|
||||
```sh
|
||||
pkg add ./deploy/fips-0.5.1-freebsd-amd64.pkg
|
||||
pkg add ./deploy/fips-<version>-freebsd-<arch>.pkg
|
||||
# post-install seeds this from the sample if absent, at mode 0600
|
||||
vi /usr/local/etc/fips/fips.yaml
|
||||
sysrc fips_enable=YES fips_dns_enable=YES
|
||||
|
||||
@@ -1029,7 +1029,7 @@ mod tests {
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_resolve_socket_addr_invalid() {
|
||||
let invalid = TransportAddr::from_string("nonexistent.invalid:2121");
|
||||
let invalid = TransportAddr::from_string("nonexistent.invalid.:2121");
|
||||
assert!(resolve_socket_addr(&invalid).await.is_err());
|
||||
|
||||
let binary = TransportAddr::new(vec![0xff, 0x80]);
|
||||
|
||||
Reference in New Issue
Block a user