From 9334c9428c4dcf8d575bfb50d6a33d10b67b5e14 Mon Sep 17 00:00:00 2001
From: vindenesen <vindenesen@gmail.com>
Date: Thu, 19 Sep 2019 20:31:58 +0200
Subject: OpenVPN - Added setting for minimum tls version

---
 src/conf_mode/interface-openvpn.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/conf_mode/interface-openvpn.py')

diff --git a/src/conf_mode/interface-openvpn.py b/src/conf_mode/interface-openvpn.py
index 34c094862..495ddfdf5 100755
--- a/src/conf_mode/interface-openvpn.py
+++ b/src/conf_mode/interface-openvpn.py
@@ -167,6 +167,10 @@ key {{ tls_key }}
 crl-verify {{ tls_crl }}
 {% endif %}
 
+{%- if tls_version_min %}
+tls-version-min {{tls_version_min}}
+{% endif %}
+
 {%- if tls_dh %}
 dh {{ tls_dh }}
 {% endif %}
@@ -283,6 +287,7 @@ default_config_data = {
     'tls_dh': '',
     'tls_key': '',
     'tls_role': '',
+    'tls_version_min': '',
     'type': 'tun',
     'uid': user,
     'gid': group,
@@ -562,6 +567,10 @@ def get_config():
          openvpn['tls_role'] = conf.return_value('tls role')
          openvpn['tls'] = True
 
+    # Minimum required TLS version
+    if conf.exists('tls minimum-tls-version'):
+         openvpn['tls_version_min'] = conf.return_value('tls minimum-tls-version')
+    
     if conf.exists('shared-secret-key-file'):
         openvpn['shared_secret_file'] = conf.return_value('shared-secret-key-file')
 
-- 
cgit v1.2.3


From 87500058e11f6846a5ba18dfa17ea685bcdca5ae Mon Sep 17 00:00:00 2001
From: vindenesen <vindenesen@gmail.com>
Date: Fri, 20 Sep 2019 13:52:44 +0200
Subject: OpenVPN - changed tls-minimum-version to tls-version-min

---
 interface-definitions/interfaces-openvpn.xml | 2 +-
 src/conf_mode/interface-openvpn.py           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/conf_mode/interface-openvpn.py')

diff --git a/interface-definitions/interfaces-openvpn.xml b/interface-definitions/interfaces-openvpn.xml
index 39fa8e6a6..f11f27e23 100644
--- a/interface-definitions/interfaces-openvpn.xml
+++ b/interface-definitions/interfaces-openvpn.xml
@@ -543,7 +543,7 @@
                   <help>File containing this host's private key</help>
                 </properties>
               </leafNode>
-              <leafNode name="minimum-tls-version">
+              <leafNode name="tls-version-min">
                 <properties>
                   <help>Specify the minimum required TLS version</help>
                   <completionHelp>
diff --git a/src/conf_mode/interface-openvpn.py b/src/conf_mode/interface-openvpn.py
index 495ddfdf5..984410eb1 100755
--- a/src/conf_mode/interface-openvpn.py
+++ b/src/conf_mode/interface-openvpn.py
@@ -568,8 +568,8 @@ def get_config():
          openvpn['tls'] = True
 
     # Minimum required TLS version
-    if conf.exists('tls minimum-tls-version'):
-         openvpn['tls_version_min'] = conf.return_value('tls minimum-tls-version')
+    if conf.exists('tls tls-version-min'):
+         openvpn['tls_version_min'] = conf.return_value('tls tls-version-min')
     
     if conf.exists('shared-secret-key-file'):
         openvpn['shared_secret_file'] = conf.return_value('shared-secret-key-file')
-- 
cgit v1.2.3