From 3af38a4d673c37ed46d7d8d43ad03a94799ad09d Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 13 Jul 2021 16:04:53 +0200
Subject: pki: ipsec: l2tp: T2816: T3642: Move IPSec/L2TP code into
 vpn_ipsec.py and update to use PKI.

---
 interface-definitions/vpn_l2tp.xml.in | 45 ++++-------------------------------
 1 file changed, 5 insertions(+), 40 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index 4fbf3fa44..d9680c5db 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -75,46 +75,7 @@
                           <help>Pre-shared secret for IPsec</help>
                         </properties>
                       </leafNode>
-                      <node name="x509">
-                        <properties>
-                          <help>X.509 certificate</help>
-                        </properties>
-                        <children>
-                          #include <include/certificate-ca.xml.i>
-                          <leafNode name="crl-file">
-                            <properties>
-                              <help>File containing the X.509 Certificate Revocation List (CRL)</help>
-                              <valueHelp>
-                                <format>txt</format>
-                                <description>File in /config/auth</description>
-                              </valueHelp>
-                            </properties>
-                          </leafNode>
-                          <leafNode name="server-cert-file">
-                            <properties>
-                              <help>File containing the X.509 certificate for the remote access VPN server (this host)</help>
-                              <valueHelp>
-                                <format>txt</format>
-                                <description>File in /config/auth</description>
-                              </valueHelp>
-                            </properties>
-                          </leafNode>
-                          <leafNode name="server-key-file">
-                            <properties>
-                              <help>File containing the private key for the X.509 certificate for the remote access VPN server (this host)</help>
-                              <valueHelp>
-                                <format>txt</format>
-                                <description>File in /config/auth</description>
-                              </valueHelp>
-                            </properties>
-                          </leafNode>
-                          <leafNode name="server-key-password">
-                            <properties>
-                              <help>Password that protects the private key</help>
-                            </properties>
-                          </leafNode>
-                        </children>
-                      </node>
+                      #include <include/ipsec/authentication-x509.xml.i>
                     </children>
                   </node>
                   <leafNode name="ike-lifetime">
@@ -128,6 +89,7 @@
                         <validator name="numeric" argument="--range 30-86400"/>
                       </constraint>
                     </properties>
+                    <defaultValue>3600</defaultValue>
                   </leafNode>
                    <leafNode name="lifetime">
                     <properties>
@@ -140,7 +102,10 @@
                         <validator name="numeric" argument="--range 30-86400"/>
                       </constraint>
                     </properties>
+                    <defaultValue>3600</defaultValue>
                   </leafNode>
+                  #include <include/ipsec/esp-group.xml.i>
+                  #include <include/ipsec/ike-group.xml.i>
                 </children>
               </node>
               #include <include/accel-ppp/wins-server.xml.i>
-- 
cgit v1.2.3