confd: restore IETF standard keystore leaf types and NACM rules

Infix key format identities now derive from the IETF bases, so the standard
identityref accepts them without any need for deviations.  This also preserves
the nacm default rules, which were inadvertently dropped before.

Also rename format identities for generality:

 - wifi-preshared-key-format      -> renamed: 'passphrase-key-format'
 - wireguard-symmetric-key-format -> use IETF 'octet-string-key-format'

Since cleartext-symmetric-key is now type binary (base64-encoded), the
WiFi backends (station and AP) decode values before passing them to
wpa_supplicant and hostapd.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2026-02-02 17:50:07 +01:00
parent 683f696e19
commit 5ceda4569e
7 changed files with 82 additions and 104 deletions
@@ -75,12 +75,12 @@ def configure_server(dut):
"symmetric-keys": {
"symmetric-key": [{
"name": "psk-client1",
"infix-keystore:symmetric-key": psk_client1,
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"cleartext-symmetric-key": psk_client1,
"key-format": "ietf-crypto-types:octet-string-key-format"
}, {
"name": "psk-client2",
"infix-keystore:symmetric-key": psk_client2,
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"cleartext-symmetric-key": psk_client2,
"key-format": "ietf-crypto-types:octet-string-key-format"
}]
}
}
@@ -226,8 +226,8 @@ def configure_client1(dut):
"symmetric-keys": {
"symmetric-key": [{
"name": "psk-server",
"infix-keystore:symmetric-key": psk_client1,
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"cleartext-symmetric-key": psk_client1,
"key-format": "ietf-crypto-types:octet-string-key-format"
}]
}
}
@@ -360,8 +360,8 @@ def configure_client2(dut):
"symmetric-keys": {
"symmetric-key": [{
"name": "psk-server",
"infix-keystore:symmetric-key": psk_client2,
"infix-keystore:key-format": "infix-crypto-types:wireguard-symmetric-key-format"
"cleartext-symmetric-key": psk_client2,
"key-format": "ietf-crypto-types:octet-string-key-format"
}]
}
}