cipher freedom

Author: Ramon00

package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/iface.uc

@@ -78,35 +78,43 @@ export function parse_encryption(config, dev_config) {
 		break;
 	}
 
-	switch(encryption[1]){
-	case 'tkip+aes':
-	case 'tkip+ccmp':
-	case 'aes+tkip':
-	case 'ccmp+tkip':
-		config.wpa_pairwise = 'CCMP TKIP';
-		break;
+let cipher_map = {
+    "tkip": "TKIP",
+    "TKIP": "TKIP",
 
-	case 'ccmp256':
-		config.wpa_pairwise = 'CCMP-256';
-		break;
+    "aes": "CCMP",
+    "AES": "CCMP",
 
-	case 'aes':
-	case 'ccmp':
-		config.wpa_pairwise = 'CCMP';
-		break;
+    "ccmp": "CCMP",
+    "CCMP": "CCMP",
 
-	case 'tkip':
-		config.wpa_pairwise = 'TKIP';
-		break;
+    "ccmp256": "CCMP-256",
+    "CCMP256": "CCMP-256",
 
-	case 'gcmp256':
-		config.wpa_pairwise = 'GCMP-256';
-		break;
+    "gcmp": "GCMP",
+    "GCMP": "GCMP",
 
-	case 'gcmp':
-		config.wpa_pairwise = 'GCMP';
-		break;
+    "gcmp256": "GCMP-256",
+    "GCMP256": "GCMP-256"
+};
 
+
+let parts = split(encryption[1], "+");
+let result = "";
+
+for (let key in parts) {
+   
+    let mapped = cipher_map[key];
+
+    if (mapped) {
+        if (result != "")
+            result += " ";
+        result += mapped;
+    }
+}
+
+if (!result) {
+switch(encryption[1]){
 	default:
 		if (config.encryption == 'wpa3-192') {
 			config.wpa_pairwise = 'GCMP-256';
@@ -122,6 +130,8 @@ export function parse_encryption(config, dev_config) {
 			config.wpa_pairwise = wpa3_pairwise;
 		break;
 	}
+}
+config.wpa_pairwise = result;
 
 };