security-policies: Rename AH proposals to IKE proposals

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/functions/functions.ipsec b/src/functions/functions.ipsec
index 03aefcdde2e184c8c35ce1888f868d35f002daf9..61bdcb28460ce880e71d298868fb67b3a2ddaee6 100644 (file)
--- a/src/functions/functions.ipsec
+++ b/src/functions/functions.ipsec
@@ -1011,7 +1011,7 @@ _ipsec_connection_to_strongswan_connection() {
 
        # IKE Proposals
        print_indent 2 "# IKE Proposals"
-       print_indent 2 "proposals = $(vpn_security_policies_make_ah_proposal ${SECURITY_POLICY})"
+       print_indent 2 "proposals = $(vpn_security_policies_make_ike_proposal ${SECURITY_POLICY})"
        print
 
        # DPD Settings

diff --git a/src/functions/functions.vpn-security-policies b/src/functions/functions.vpn-security-policies
index fef1512741da49a4b1b93422b1d79a406ed61691..bd24b06606492126901ea6349aa1e62f6d52e6b1 100644 (file)
--- a/src/functions/functions.vpn-security-policies
+++ b/src/functions/functions.vpn-security-policies
@@ -890,7 +890,7 @@ vpn_security_policies_cipher_is_aead() {
        string_match "[CG]CM" "${cipher}"
 }
 
-vpn_security_policies_make_ah_proposal() {
+vpn_security_policies_make_ike_proposal() {
        local name=${1}
 
        if ! vpn_security_policy_exists ${name}; then
@@ -898,7 +898,7 @@ vpn_security_policies_make_ah_proposal() {
        fi
 
        local config_path="$(vpn_security_policies_path ${name})"
-       local cache_path="${NETWORK_CACHE_DIR}/vpn/security-policies/${name}/ah-proposal"
+       local cache_path="${NETWORK_CACHE_DIR}/vpn/security-policies/${name}/ike-proposal"
 
        # Get data from cache if possible
        if file_exists "${cache_path}" && ! file_is_newer_than "${config_path}" "${cache_path}"; then
@@ -907,7 +907,7 @@ vpn_security_policies_make_ah_proposal() {
        fi
 
        # No or invalid cache data found
-       local proposal=$(_vpn_security_policies_make_ah_proposal "${name}")
+       local proposal=$(_vpn_security_policies_make_ike_proposal "${name}")
 
        # Write proposal to cache
        if ! make_parent_dir "${cache_path}" || ! fwrite "${cache_path}" "${proposal}"; then
@@ -917,7 +917,7 @@ vpn_security_policies_make_ah_proposal() {
        print "${proposal}"
 }
 
-_vpn_security_policies_make_ah_proposal() {
+_vpn_security_policies_make_ike_proposal() {
        local name=${1}
 
        # Read the config settings