]> git.ipfire.org Git - people/jschlag/network.git/commitdiff
wireless networks: Allow using a custom CA per network
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Aug 2017 10:31:11 +0000 (10:31 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 Aug 2017 10:31:11 +0000 (10:31 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/functions/functions.wireless-networks

index 0fbf8bfd050b5c4eaf797817e4617399123fc706..6efc95b050b17c729a8be0cd80e9167cb36190ba 100644 (file)
@@ -430,6 +430,9 @@ wireless_network_to_wpa_supplicant() {
        assert isset auth_alg
        assert isset key_mgmt
 
+       # Read CA certificate
+       local ca_cert_path="${NETWORK_WIRELESS_NETWORKS_DIR}/${handle}/ca.pem"
+
        print_indent 0 "# ${SSID}"
        print_indent 0 "network={"
        print_indent 1 "ssid=\"${SSID}\""
@@ -478,8 +481,11 @@ wireless_network_to_wpa_supplicant() {
        fi
 
        # Validate server certificates
-       if isset CA_BUNDLE; then
-               print_indent 1 "ca_cert=${CA_BUNDLE}"
+       if file_exists "${ca_cert_path}"; then
+               print_indent 1 "ca_cert=\"${ca_cert_path}\""
+
+       elif isset CA_BUNDLE; then
+               print_indent 1 "ca_cert=\"${CA_BUNDLE}\""
        fi
 
        print_indent 0 "}"