YANG: Rename cleartext-symmetric-key => symmetric-key

Author: mattiaswal

board/aarch64/bananapi-bpi-r3/rootfs/usr/share/product/bananapi,bpi-r3/etc/factory-config.cfg

@@ -218,7 +218,7 @@
       "symmetric-key": [
         {
           "name": "wifi",
-          "infix-keystore:cleartext-symmetric-key": "infixinfix",
+          "infix-keystore:symmetric-key": "infixinfix",
           "infix-keystore:key-format": "infix-crypto-types:wifi-preshared-key-format"
         }
       ]

board/aarch64/raspberrypi-rpi64/README.md

@@ -108,7 +108,7 @@ To configure WiFi as a client, first store your WiFi password in the keystore:
 admin@infix:/> configure
 admin@infix:/config/> edit keystore symmetric-key mywifi
 admin@infix:/config/keystore/…/mywifi/> set key-format wifi-preshared-key-format
-admin@infix:/config/keystore/…/mywifi/> set cleartext-symmetric-key YourWiFiPassword
+admin@infix:/config/keystore/…/mywifi/> set symmetric-key YourWiFiPassword
 admin@infix:/config/keystore/…/mywifi/> leave
 ```
 

doc/wifi.md

@@ -182,7 +182,7 @@ and 63 characters
 admin@example:/> configure
 admin@example:/config/> edit keystore symmetric-key example
 admin@example:/config/keystore/…/example/> set key-format wifi-preshared-key-format
-admin@example:/config/keystore/…/example/> set cleartext-symmetric-key mysecret
+admin@example:/config/keystore/…/example/> set symmetric-key mysecret
 admin@example:/config/keystore/…/example/> leave
 admin@example:/>
 ```
@@ -299,15 +299,15 @@ admin@example:/config/hardware/component/radio0/wifi-radio/> leave
 admin@example:/> configure
 admin@example:/config/> edit keystore symmetric-key main-secret
 admin@example:/config/keystore/…/main-secret/> set key-format wifi-preshared-key-format
-admin@example:/config/keystore/…/main-secret/> set cleartext-symmetric-key MyMainPassword
+admin@example:/config/keystore/…/main-secret/> set symmetric-key MyMainPassword
 admin@example:/config/keystore/…/main-secret/> up
 admin@example:/config/> edit keystore symmetric-key guest-secret
 admin@example:/config/keystore/…/guest-secret/> set key-format wifi-preshared-key-format
-admin@example:/config/keystore/…/guest-secret/> set cleartext-symmetric-key GuestPassword123
+admin@example:/config/keystore/…/guest-secret/> set symmetric-key GuestPassword123
 admin@example:/config/keystore/…/guest-secret/> up
 admin@example:/config/> edit keystore symmetric-key iot-secret
 admin@example:/config/keystore/…/iot-secret/> set key-format wifi-preshared-key-format
-admin@example:/config/keystore/…/iot-secret/> set cleartext-symmetric-key IoTDevices2025
+admin@example:/config/keystore/…/iot-secret/> set symmetric-key IoTDevices2025
 admin@example:/config/keystore/…/iot-secret/> leave
 ```
 

src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh

@@ -1,8 +1,5 @@
 #!/bin/sh
-# Migrate keystore symmetric key syntax to new YANG schema (RFC 9643)
-# The 'cleartext-key' leaf has been renamed to 'cleartext-symmetric-key'
-# Old: symmetric-key[]/key-type/cleartext-key
-# New: symmetric-key[]/key-type/cleartext-symmetric-key
+# Rename cleartext-symmetric-key to symmetric-key
 
 file=$1
 temp=${file}.tmp
@@ -14,7 +11,7 @@ if .["ietf-keystore:keystore"]?."symmetric-keys"?."symmetric-key" then
       # Rename cleartext-key to cleartext-symmetric-key
       ."key-type"."cleartext-key" as $key_value |
       ."key-type" |= (del(."cleartext-key") | . + {
-        "cleartext-symmetric-key": $key_value
+        "symmetric-key": $key_value
       })
     else
       .

src/confd/src/hardware.c

@@ -210,7 +210,7 @@ static int wifi_gen_station(const char *ifname, struct lyd_node *station,
 
 	if (secret_name && strcmp(security_mode, "disabled") != 0) {
 		secret_node = lydx_get_xpathf(config,
-			"/keystore/symmetric-keys/symmetric-key[name='%s']/cleartext-symmetric-key",
+			"/keystore/symmetric-keys/symmetric-key[name='%s']/symmetric-key",
 			secret_name);
 		secret = secret_node ? lyd_get_value(secret_node) : NULL;
 	} else {
@@ -340,7 +340,7 @@ static int wifi_gen_bss_section(FILE *hostapd, struct lyd_node *cifs, const char
 		secret_name = lydx_get_cattr(security, "secret");
 		if (secret_name) {
 			secret_node = lydx_get_xpathf(config,
-				"/keystore/symmetric-keys/symmetric-key[name='%s']/cleartext-symmetric-key",
+				"/keystore/symmetric-keys/symmetric-key[name='%s']/symmetric-key",
 				secret_name);
 			if (secret_node)
 				secret = lyd_get_value(secret_node);
@@ -452,7 +452,7 @@ static int wifi_gen_aps_on_radio(const char *radio_name, struct lyd_node *cifs,
 	if (secret_name && strcmp(security_mode, "open") != 0) {
 		ERROR("Looking for secret '%s' in keystore", secret_name);
 		secret_node = lydx_get_xpathf(config,
-			"/keystore/symmetric-keys/symmetric-key[name='%s']/cleartext-symmetric-key",
+			"/keystore/symmetric-keys/symmetric-key[name='%s']/symmetric-key",
 			secret_name);
 		ERROR("XPath query result: %p", secret_node);
 		if (secret_node) {

src/confd/yang/confd/infix-keystore.yang

@@ -55,7 +55,7 @@ module infix-keystore {
   }
   augment "/ks:keystore/ks:symmetric-keys/ks:symmetric-key/ks:key-type" {
     case cleartext-symmetric-key {
-      leaf cleartext-symmetric-key {
+      leaf symmetric-key {
         type string;
         must "../../key-format != 'infix-ct:wifi-preshared-key-format' or " +
           "(string-length(.) >= 8 and string-length(.) <= 63)" {