Ubuntu Pastebin

Paste from dorian at Sun, 1 May 2016 10:29:35 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
--- a/src/nm-openvpn-service.c	2016-04-23 19:44:39.000000000 +0200
+++ b/src/nm-openvpn-service.c	2016-04-23 19:45:08.947430744 +0200
@@ -139,6 +139,7 @@
 	{ NM_OPENVPN_KEY_DEV,                  G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_DEV_TYPE,             G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_TUN_IPV6,             G_TYPE_STRING, 0, 0, FALSE },
+	{ NM_OPENVPN_KEY_TLS_CIPHER,           G_TYPE_STRING, 0, 0, FALSE},
 	{ NM_OPENVPN_KEY_TLS_REMOTE,           G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_REMOTE_CERT_TLS,      G_TYPE_STRING, 0, 0, FALSE },
 	{ NM_OPENVPN_KEY_NS_CERT_TYPE,         G_TYPE_STRING, 0, 0, FALSE },
@@ -1371,6 +1372,13 @@
 			add_openvpn_arg (args, tmp);
 	}
 
+	/* TLS Ciphers */
+	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_CIPHER);
+	if (tmp && strlen(tmp)) {
+	  add_openvpn_arg (args, "--tls-cipher");
+	  add_openvpn_arg (args, tmp);
+	}
+
 	/* tls-remote */
 	tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_REMOTE);
 	if (tmp && strlen (tmp)) {
--- a/shared/nm-openvpn-service-defines.h	2016-04-05 22:53:57.000000000 +0200
+++ b/shared/nm-openvpn-service-defines.h	2016-04-23 19:45:25.139500707 +0200
@@ -59,6 +59,7 @@
 #define NM_OPENVPN_KEY_STATIC_KEY_DIRECTION "static-key-direction"
 #define NM_OPENVPN_KEY_TA "ta"
 #define NM_OPENVPN_KEY_TA_DIR "ta-dir"
+#define NM_OPENVPN_KEY_TLS_CIPHER "tls-cipher"
 #define NM_OPENVPN_KEY_TUNNEL_MTU "tunnel-mtu"
 #define NM_OPENVPN_KEY_USERNAME "username"
 #define NM_OPENVPN_KEY_TAP_DEV "tap-dev"
Download as text