diff options
Diffstat (limited to 'interface-definitions/vpn-ipsec.xml.in')
| -rw-r--r-- | interface-definitions/vpn-ipsec.xml.in | 78 | 
1 files changed, 76 insertions, 2 deletions
| diff --git a/interface-definitions/vpn-ipsec.xml.in b/interface-definitions/vpn-ipsec.xml.in index 4776c53dc..9d20926ec 100644 --- a/interface-definitions/vpn-ipsec.xml.in +++ b/interface-definitions/vpn-ipsec.xml.in @@ -11,6 +11,40 @@            <priority>901</priority>          </properties>          <children> +          <node name="authentication"> +            <properties> +              <help>Authentication</help> +            </properties> +            <children> +              <tagNode name="psk"> +                <properties> +                  <help>Pre-shared key name</help> +                </properties> +                <children> +                  #include <include/dhcp-interface-multi.xml.i> +                  <leafNode name="id"> +                    <properties> +                      <help>ID for authentication</help> +                      <valueHelp> +                        <format>txt</format> +                        <description>ID used for authentication</description> +                      </valueHelp> +                      <multi/> +                    </properties> +                  </leafNode> +                  <leafNode name="secret"> +                    <properties> +                      <help>IKE pre-shared secret key</help> +                      <valueHelp> +                        <format>txt</format> +                        <description>IKE pre-shared secret key</description> +                      </valueHelp> +                    </properties> +                  </leafNode> +                </children> +              </tagNode> +            </children> +          </node>            <leafNode name="disable-uniqreqids">              <properties>                <help>Disable requirement for unique IDs in the Security Database</help> @@ -465,6 +499,45 @@                      </properties>                      <defaultValue>2</defaultValue>                    </leafNode> +                  <leafNode name="prf"> +                    <properties> +                      <help>Pseudo-Random Functions</help> +                      <completionHelp> +                        <list>prfmd5 prfsha1 prfaesxcbc prfaescmac prfsha256 prfsha384 prfsha512</list> +                      </completionHelp> +                      <valueHelp> +                        <format>prfmd5</format> +                        <description>MD5 PRF</description> +                      </valueHelp> +                      <valueHelp> +                        <format>prfsha1</format> +                        <description>SHA1 PRF</description> +                      </valueHelp> +                      <valueHelp> +                        <format>prfaesxcbc</format> +                        <description>AES XCBC PRF</description> +                      </valueHelp> +                      <valueHelp> +                        <format>prfaescmac</format> +                        <description>AES CMAC PRF</description> +                      </valueHelp> +                      <valueHelp> +                        <format>prfsha256</format> +                        <description>SHA2_256 PRF</description> +                      </valueHelp> +                      <valueHelp> +                        <format>prfsha384</format> +                        <description>SHA2_384 PRF</description> +                      </valueHelp> +                      <valueHelp> +                        <format>prfsha512</format> +                        <description>SHA2_512 PRF</description> +                      </valueHelp> +                      <constraint> +                        <regex>(prfmd5|prfsha1|prfaesxcbc|prfaescmac|prfsha256|prfsha384|prfsha512)</regex> +                      </constraint> +                    </properties> +                  </leafNode>                    #include <include/vpn-ipsec-encryption.xml.i>                    #include <include/vpn-ipsec-hash.xml.i>                  </children> @@ -884,10 +957,11 @@                    #include <include/name-server-ipv4-ipv6.xml.i>                  </children>                </tagNode> -              #include <include/radius-server-ipv4.xml.i> +              #include <include/radius-auth-server-ipv4.xml.i>                <node name="radius">                  <children>                    #include <include/radius-nas-identifier.xml.i> +                  #include <include/radius-timeout.xml.i>                    <tagNode name="server">                      <children>                        #include <include/accel-ppp/radius-additions-disable-accounting.xml.i> @@ -947,7 +1021,6 @@                            </constraint>                          </properties>                        </leafNode> -                      #include <include/ipsec/authentication-pre-shared-secret.xml.i>                        <leafNode name="remote-id">                          <properties>                            <help>ID for remote authentication</help> @@ -956,6 +1029,7 @@                              <description>ID used for peer authentication</description>                            </valueHelp>                          </properties> +                        <defaultValue>%any</defaultValue>                        </leafNode>                        <leafNode name="use-x509-id">                          <properties> | 
