From 5a7c46016a23387312b2c9e18528ad7bb20e8366 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 6 Jul 2021 23:19:48 +0200
Subject: pki: T3642: Migrate rsa-keys to PKI configuration

---
 .../include/ipsec/authentication-rsa.xml.i         | 30 ++++++++++++++
 interface-definitions/vpn_ipsec.xml.in             |  6 +--
 interface-definitions/vpn_rsa-keys.xml.in          | 47 ----------------------
 3 files changed, 31 insertions(+), 52 deletions(-)
 create mode 100644 interface-definitions/include/ipsec/authentication-rsa.xml.i
 delete mode 100644 interface-definitions/vpn_rsa-keys.xml.in

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/ipsec/authentication-rsa.xml.i b/interface-definitions/include/ipsec/authentication-rsa.xml.i
new file mode 100644
index 000000000..0a364e838
--- /dev/null
+++ b/interface-definitions/include/ipsec/authentication-rsa.xml.i
@@ -0,0 +1,30 @@
+<!-- include start from ipsec/authentication-rsa.xml.i -->
+<node name="rsa">
+  <properties>
+    <help>RSA keys</help>
+  </properties>
+  <children>
+    <leafNode name="local-key">
+      <properties>
+        <help>Name of PKI key-pair with local private key</help>
+        <completionHelp>
+          <path>pki key-pair</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    <leafNode name="passphrase">
+      <properties>
+        <help>Local private key passphrase</help>
+      </properties>
+    </leafNode>
+    <leafNode name="remote-key">
+      <properties>
+        <help>Name of PKI key-pair with remote public key</help>
+        <completionHelp>
+          <path>pki key-pair</path>
+        </completionHelp>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/vpn_ipsec.xml.in b/interface-definitions/vpn_ipsec.xml.in
index 4425ab02a..147f351f2 100644
--- a/interface-definitions/vpn_ipsec.xml.in
+++ b/interface-definitions/vpn_ipsec.xml.in
@@ -922,6 +922,7 @@
                     </properties>
                     <children>
                       #include <include/ipsec/authentication-id.xml.i>
+                      #include <include/ipsec/authentication-rsa.xml.i>
                       #include <include/ipsec/authentication-x509.xml.i>
                       <leafNode name="mode">
                         <properties>
@@ -964,11 +965,6 @@
                           </valueHelp>
                         </properties>
                       </leafNode>
-                      <leafNode name="rsa-key-name">
-                        <properties>
-                          <help>RSA key name</help>
-                        </properties>
-                      </leafNode>
                       <leafNode name="use-x509-id">
                         <properties>
                           <help>Use certificate common name as ID</help>
diff --git a/interface-definitions/vpn_rsa-keys.xml.in b/interface-definitions/vpn_rsa-keys.xml.in
deleted file mode 100644
index 2d8e97f4f..000000000
--- a/interface-definitions/vpn_rsa-keys.xml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<interfaceDefinition>
-  <node name="vpn">
-    <children>
-      <node name="rsa-keys" owner="${vyos_conf_scripts_dir}/vpn_rsa-keys.py">
-        <properties>
-          <help>RSA keys</help>
-          <priority>900</priority>
-        </properties>
-        <children>
-          <node name="local-key">
-            <properties>
-              <help>Local RSA key</help>
-            </properties>
-            <children>
-              <leafNode name="file">
-                <properties>
-                  <help>Local RSA key file location</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>File in /config/auth or /config/ipsec.d/rsa-keys</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
-          <tagNode name="rsa-key-name">
-            <properties>
-              <help>Name of remote RSA key</help>
-            </properties>
-            <children>
-              <leafNode name="rsa-key">
-                <properties>
-                  <help>Remote RSA key</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Remote RSA key</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-            </children>
-          </tagNode>
-        </children>
-      </node>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3