Skip to content

Misc #1348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
troglobit merged 2 commits into from
Jan 10, 2026
+29 −7
Merged

Misc #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d43b9d
hostapd: Do not recreate bss-interfaces
mattiaswal Jan 9, 2026
2ff02d0
yang: keystore: Revert changes done when merging WireGuard
mattiaswal Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions patches/hostapd/0002-do-not-recreate-interfaces.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 2406658da..4226a98ca 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -1508,7 +1496,7 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first,
conf->iface, addr, hapd,
&hapd->drv_priv, force_ifname, if_addr,
conf->bridge[0] ? conf->bridge : NULL,
- first == -1)) {
+ 1)) {
wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
MACSTR ")", MAC2STR(hapd->own_addr));
hapd->interface_added = 0;
2 changes: 1 addition & 1 deletion src/confd/yang/confd/infix-if-wireguard.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ submodule infix-if-wireguard {

This provides post-quantum resistance as an attacker would need
to break both the Curve25519 key exchange and this symmetric key.";
must "derived-from-or-self(deref(.)/../ks:key-format, 'ixct:wireguard-symmetric-key-format')" {
must "derived-from-or-self(deref(.)/../infix-ks:key-format, 'ixct:wireguard-symmetric-key-format')" {
error-message "Preshared key must be in wireguard-symmetric-key-format";
}
}
Expand Down
13 changes: 11 additions & 2 deletions src/confd/yang/confd/infix-keystore.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,19 @@ module infix-keystore {
}
}
deviation "/ks:keystore/ks:symmetric-keys/ks:symmetric-key/ks:key-format" {
deviate replace {
deviate not-supported;
}
augment "/ks:keystore/ks:symmetric-keys/ks:symmetric-key" {
leaf key-format {
type identityref {
base infix-ct:symmetric-key-format;
}
description
"Identifies the symmetric key's format

Valid symmetric key formats are:
wifi-preshared-key-format - WiFi preshared key
wireguard-symmetric-key-format - WireGuard preshared key";
}
}
deviation "/ks:keystore/ks:symmetric-keys/ks:symmetric-key/ks:key-type/ks:cleartext-symmetric-key" {
Expand All @@ -52,7 +61,7 @@ module infix-keystore {
case cleartext-symmetric-key {
leaf symmetric-key {
type string;
must "../../key-format != 'infix-ct:wifi-preshared-key-format' or " +
must "../infix-ks:key-format != 'infix-ct:wifi-preshared-key-format' or " +
"(string-length(.) >= 8 and string-length(.) <= 63)" {
error-message "WiFi pre-shared key must be 8-63 characters long";
}
Expand Down
8 changes: 4 additions & 4 deletions test/case/interfaces/wireguard_multipoint/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ def configure_server(dut):
"symmetric-key": [{
"name": "psk-client1",
"infix-keystore:symmetric-key": psk_client1,
"key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
}, {
"name": "psk-client2",
"infix-keystore:symmetric-key": psk_client2,
"key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
}]
}
}
Expand Down Expand Up @@ -227,7 +227,7 @@ def configure_client1(dut):
"symmetric-key": [{
"name": "psk-server",
"infix-keystore:symmetric-key": psk_client1,
"key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
}]
}
}
Expand Down Expand Up @@ -361,7 +361,7 @@ def configure_client2(dut):
"symmetric-key": [{
"name": "psk-server",
"infix-keystore:symmetric-key": psk_client2,
"key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
}]
}
}
Expand Down