Makefile: Fix typo in localstatedir

[people/ms/network.git] / src / functions / functions.vpn-security-policies

diff --git a/src/functions/functions.vpn-security-policies b/src/functions/functions.vpn-security-policies
index 88d55bad9fd252e506e9fc2c3388e4bc6a606308..138e8210e12096dc696ba3c47287dac2acf330fe 100644 (file)
--- a/src/functions/functions.vpn-security-policies
+++ b/src/functions/functions.vpn-security-policies
@@ -19,8 +19,8 @@
 #                                                                             #
 ###############################################################################
 
-VPN_SECURITY_POLICIES_CONFIG_SETTINGS="CIPHERS COMPRESSION GROUP_TYPE \
-       INTEGRITY PSEUDO_RANDOM_FUNCTIONS KEY_EXCHANGE LIFETIME PFS"
+VPN_SECURITY_POLICIES_CONFIG_SETTINGS="CIPHERS COMPRESSION GROUP_TYPES \
+       INTEGRITIES PSEUDO_RANDOM_FUNCTIONS KEY_EXCHANGE LIFETIME PFS"
 VPN_SECURITY_POLICIES_READONLY="system performance"
 
 VPN_DEFAULT_SECURITY_POLICY="system"
@@ -203,7 +203,7 @@ declare -A PSEUDO_RANDOM_FUNCTION_TO_STRONGSWAN=(
        [AES-CMAC]="prfaescmac"
 )
 
-declare -A VPN_SUPPORTED_INTEGRITY=(
+declare -A VPN_SUPPORTED_INTEGRITIES=(
        [MD5]="MD5-HMAC"
 
        # SHA
@@ -263,6 +263,9 @@ declare -A VPN_SUPPORTED_GROUP_TYPES=(
 
        # Curve25519
        [CURVE25519]="256 bit Elliptic Curve 25519"
+
+       # Curve448
+       [CURVE448]="224 bit Elliptic Curve 448"
 )
 
 declare -A GROUP_TYPE_TO_STRONGSWAN=(
@@ -289,8 +292,9 @@ declare -A GROUP_TYPE_TO_STRONGSWAN=(
        [ECP384BP]="ecp384bp"
        [ECP512BP]="ecp512bp"
 
-       # Curve25519
+       # More Curves
        [CURVE25519]="curve25519"
+       [CURVE448]="curve448"
 )
 
 cli_vpn_security_policies() {
@@ -303,14 +307,14 @@ cli_vpn_security_policies() {
                shift 2
 
                case "${key}" in
-                       ciphers|compression|integrity|lifetime|pfs|show)
+                       ciphers|compression|integrities|lifetime|pfs|show)
                                vpn_security_policies_${key} ${security_policy} "$@"
                                ;;
                        pseudo-random-functions)
                                vpn_security_policies_pseudo_random_functions "${security_policy}" "$@"
                                ;;
-                       group-type)
-                               vpn_security_policies_group_type ${security_policy} "$@"
+                       group-types)
+                               vpn_security_policies_group_types ${security_policy} "$@"
                                ;;
                        key-exchange)
                                vpn_security_policies_key_exchange ${security_policy} "$@"
@@ -506,8 +510,8 @@ vpn_security_policies_show() {
 
        cli_print_fmt1 1 "Integrity:"
        local integrity
-       for integrity in ${INTEGRITY}; do
-               cli_print_fmt1 2 "${VPN_SUPPORTED_INTEGRITY[${integrity}]-${integrity}}"
+       for integrity in ${INTEGRITIES}; do
+               cli_print_fmt1 2 "${VPN_SUPPORTED_INTEGRITIES[${integrity}]-${integrity}}"
        done
        cli_space
 
@@ -520,7 +524,7 @@ vpn_security_policies_show() {
 
        cli_print_fmt1 1 "Group Types:"
        local group_type
-       for group_type in ${GROUP_TYPE}; do
+       for group_type in ${GROUP_TYPES}; do
                cli_print_fmt1 2 "${VPN_SUPPORTED_GROUP_TYPES[${group_type}]-${group_type}}"
        done
        cli_space
@@ -686,7 +690,7 @@ vpn_security_policies_compression(){
 }
 
 # This function parses the parameters for the 'group-type' command
-vpn_security_policies_group_type(){
+vpn_security_policies_group_types() {
        local name=${1}
        shift
 
@@ -695,13 +699,13 @@ vpn_security_policies_group_type(){
                return ${EXIT_ERROR}
        fi
 
-       local GROUP_TYPE
-       if ! vpn_security_policies_read_config ${name} "GROUP_TYPE"; then
+       local GROUP_TYPES
+       if ! vpn_security_policies_read_config ${name} "GROUP_TYPES"; then
                return ${EXIT_ERROR}
        fi
 
        # Remove duplicated entries to proceed the list safely
-       GROUP_TYPE="$(list_unique ${GROUP_TYPE})"
+       GROUP_TYPES="$(list_unique ${GROUP_TYPES})"
 
        local group_types_added
        local group_types_removed
@@ -745,7 +749,7 @@ vpn_security_policies_group_type(){
                        fi
                done
 
-               GROUP_TYPE="${group_types_set}"
+               GROUP_TYPES="${group_types_set}"
 
        # Perform incremental updates
        else
@@ -753,14 +757,14 @@ vpn_security_policies_group_type(){
 
                # Perform all removals
                for group_type in ${group_types_removed}; do
-                       if ! list_remove GROUP_TYPE ${group_type}; then
+                       if ! list_remove GROUP_TYPES ${group_type}; then
                                warning "${group_type} was not on the list and could not be removed"
                        fi
                done
 
                for group_type in ${group_types_added}; do
                        if vpn_security_policies_group_type_supported ${group_type}; then
-                               if ! list_append_unique GROUP_TYPE ${group_type}; then
+                               if ! list_append_unique GROUP_TYPES ${group_type}; then
                                        warning "${group_type} is already on the group type list"
                                fi
                        else
@@ -770,39 +774,39 @@ vpn_security_policies_group_type(){
        fi
 
        # Check if the list contain at least one valid group_type
-       if list_is_empty GROUP_TYPE; then
+       if list_is_empty GROUP_TYPES; then
                error "Cannot save an empty group type list"
                return ${EXIT_ERROR}
        fi
 
        # Save everything
-       if ! vpn_security_policies_write_config_key ${name} "GROUP_TYPE" ${GROUP_TYPE}; then
+       if ! vpn_security_policies_write_config_key ${name} "GROUP_TYPES" ${GROUP_TYPES}; then
                log ERROR "The changes for the vpn security policy ${name} could not be written."
        fi
 
        cli_headline 1 "Current group type list for ${name}:"
-       for group_type in ${GROUP_TYPE}; do
+       for group_type in ${GROUP_TYPES}; do
                cli_print_fmt1 1 "${group_type}" "${VPN_SUPPORTED_GROUP_TYPES[${group_type}]}"
        done
 }
 
 # This function parses the parameters for the 'integrity' command
-vpn_security_policies_integrity(){
+vpn_security_policies_integrities() {
        local name=${1}
        shift
 
        if [ $# -eq 0 ]; then
-               log ERROR "You must pass at least one value after integrity"
+               log ERROR "You must pass at least one value"
                return ${EXIT_ERROR}
        fi
 
-       local INTEGRITY
-       if ! vpn_security_policies_read_config ${name} "INTEGRITY"; then
+       local INTEGRITIES
+       if ! vpn_security_policies_read_config ${name} "INTEGRITIES"; then
                return ${EXIT_ERROR}
        fi
 
        # Remove duplicated entries to proceed the list safely
-       INTEGRITY="$(list_unique ${INTEGRITY})"
+       INTEGRITIES="$(list_unique ${INTEGRITIES})"
 
        local integritys_added
        local integritys_removed
@@ -846,7 +850,7 @@ vpn_security_policies_integrity(){
                        fi
                done
 
-               INTEGRITY="${integritys_set}"
+               INTEGRITIES="${integritys_set}"
 
        # Perform incremental updates
        else
@@ -854,14 +858,14 @@ vpn_security_policies_integrity(){
 
                # Perform all removals
                for integrity in ${integritys_removed}; do
-                       if ! list_remove INTEGRITY ${integrity}; then
+                       if ! list_remove INTEGRITIES ${integrity}; then
                                warning "${integrity} was not on the list and could not be removed"
                        fi
                done
 
                for integrity in ${integritys_added}; do
                        if vpn_security_policies_integrity_supported ${integrity}; then
-                               if ! list_append_unique INTEGRITY ${integrity}; then
+                               if ! list_append_unique INTEGRITIES ${integrity}; then
                                        warning "${integrity} is already on the integrity list"
                                fi
                        else
@@ -871,19 +875,19 @@ vpn_security_policies_integrity(){
        fi
 
        # Check if the list contain at least one valid integrity
-       if list_is_empty INTEGRITY; then
+       if list_is_empty INTEGRITIES; then
                error "Cannot save an empty integrity hashes list"
                return ${EXIT_ERROR}
        fi
 
        # Save everything
-       if ! vpn_security_policies_write_config_key ${name} "INTEGRITY" ${INTEGRITY}; then
+       if ! vpn_security_policies_write_config_key ${name} "INTEGRITIES" ${INTEGRITIES}; then
                log ERROR "The changes for the vpn security policy ${name} could not be written."
        fi
 
        cli_headline 1 "Current integrity hashes list for ${name}:"
-       for integrity in ${INTEGRITY}; do
-               cli_print_fmt1 1 "${integrity}" "${VPN_SUPPORTED_INTEGRITY[${integrity}]}"
+       for integrity in ${INTEGRITIES}; do
+               cli_print_fmt1 1 "${integrity}" "${VPN_SUPPORTED_INTEGRITIES[${integrity}]}"
        done
 }
 
@@ -1155,7 +1159,7 @@ vpn_security_policies_group_type_supported() {
 vpn_security_policies_integrity_supported() {
        local integrity=${1}
 
-       list_match ${integrity} ${!VPN_SUPPORTED_INTEGRITY[@]}
+       list_match ${integrity} ${!VPN_SUPPORTED_INTEGRITIES[@]}
 }
 
 vpn_security_policies_pseudo_random_function_supported() {
@@ -1219,7 +1223,7 @@ _vpn_security_policies_make_ike_proposal() {
        local proposals
 
        local cipher
-       for cipher in ${CIPHER}; do
+       for cipher in ${CIPHERS}; do
                # Translate cipher
                local _cipher=${CIPHER_TO_STRONGSWAN[${cipher}]}
 
@@ -1239,7 +1243,7 @@ _vpn_security_policies_make_ike_proposal() {
                                fi
 
                                local group_type
-                               for group_type in ${GROUP_TYPE}; do
+                               for group_type in ${GROUP_TYPES}; do
                                        local _group_type=${GROUP_TYPE_TO_STRONGSWAN[${group_type}]}
 
                                        if ! isset _group_type; then
@@ -1253,7 +1257,7 @@ _vpn_security_policies_make_ike_proposal() {
                        done
                else
                        local integrity
-                       for integrity in ${INTEGRITY}; do
+                       for integrity in ${INTEGRITIES}; do
                                local _integrity=${INTEGRITY_TO_STRONGSWAN[${integrity}]}
 
                                if ! isset _integrity; then
@@ -1262,7 +1266,7 @@ _vpn_security_policies_make_ike_proposal() {
                                fi
 
                                local group_type
-                               for group_type in ${GROUP_TYPE}; do
+                               for group_type in ${GROUP_TYPES}; do
                                        local _group_type=${GROUP_TYPE_TO_STRONGSWAN[${group_type}]}
 
                                        if ! isset _group_type; then
@@ -1320,7 +1324,7 @@ _vpn_security_policies_make_esp_proposal() {
        local proposals
 
        local cipher
-       for cipher in ${CIPHER}; do
+       for cipher in ${CIPHERS}; do
                # Translate cipher
                local _cipher=${CIPHER_TO_STRONGSWAN[${cipher}]}
 
@@ -1331,7 +1335,7 @@ _vpn_security_policies_make_esp_proposal() {
 
                if vpn_security_policies_cipher_is_aead ${cipher}; then
                        local group_type
-                       for group_type in ${GROUP_TYPE}; do
+                       for group_type in ${GROUP_TYPES}; do
                                local _group_type=${GROUP_TYPE_TO_STRONGSWAN[${group_type}]}
 
                                if ! isset _group_type; then
@@ -1344,7 +1348,7 @@ _vpn_security_policies_make_esp_proposal() {
                        done
                else
                        local integrity
-                       for integrity in ${INTEGRITY}; do
+                       for integrity in ${INTEGRITIES}; do
                                local _integrity=${INTEGRITY_TO_STRONGSWAN[${integrity}]}
 
                                if ! isset _integrity; then
@@ -1353,7 +1357,7 @@ _vpn_security_policies_make_esp_proposal() {
                                fi
 
                                local group_type
-                               for group_type in ${GROUP_TYPE}; do
+                               for group_type in ${GROUP_TYPES}; do
                                        local _group_type=${GROUP_TYPE_TO_STRONGSWAN[${group_type}]}
 
                                        if ! isset _group_type; then