Commit d1ac09d7 authored by Michael Biebl's avatar Michael Biebl

New upstream version 1.8.4

parent f333bed2
......@@ -308,6 +308,8 @@ EXTRA_DIST += \
properties/tests/conf/ping-with-restart.ovpn \
properties/tests/conf/route.ovpn \
properties/tests/conf/server-poll-timeout.ovpn \
properties/tests/conf/crl-file.ovpn \
properties/tests/conf/crl-dir.ovpn \
properties/tests/conf/tls-inline.ovpn \
properties/tests/conf/tls-inline-ca.pem \
properties/tests/conf/tls-inline-cert.pem \
......
......@@ -822,6 +822,8 @@ EXTRA_DIST = properties/gresource.xml \
properties/tests/conf/ping-with-restart.ovpn \
properties/tests/conf/route.ovpn \
properties/tests/conf/server-poll-timeout.ovpn \
properties/tests/conf/crl-file.ovpn \
properties/tests/conf/crl-dir.ovpn \
properties/tests/conf/tls-inline.ovpn \
properties/tests/conf/tls-inline-ca.pem \
properties/tests/conf/tls-inline-cert.pem \
......
=======================================================
NetworkManager-openvpn-1.8.4
Overview of changes since NetworkManager-openvpn-1.8.2
=======================================================
This is a new stable release of NetworkManager-openvpn. Notable changes include:
* Add support for the crl-verify option (bgo #782309)
* Fix termination of openvpn process upon disconnect (rh #1576600)
* Update Czech, Finnish, Galician, German, Italian, Latvian,
Lithuanian, Polish, Russian and Swedish translations.
=======================================================
NetworkManager-openvpn-1.8.2
Overview of changes since NetworkManager-openvpn-1.8.0
......
......@@ -47,7 +47,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
#
# Modified to require ngettext
# Matthias Clasen <mclasen@redhat.com> 08/06/2004
#
# Increment this whenever this file is changed.
#serial 1
# We need this here as well, since someone might use autoconf-2.5x
# to configure GLib then an older version to configure a package
# using AM_GLIB_GNU_GETTEXT
......
......@@ -13,28 +13,34 @@
<name xml:lang="el">Πελάτης OpenVPN</name>
<name xml:lang="es">Cliente de OpenVPN</name>
<name xml:lang="fi">OpenVPN-asiakasohjelmisto</name>
<name xml:lang="gl">Cliente OpenVPN</name>
<name xml:lang="hu">OpenVPN kliens</name>
<name xml:lang="id">Klien OpenVPN</name>
<name xml:lang="it">Client OpenVPN</name>
<name xml:lang="lt">OpenVPN klientas</name>
<name xml:lang="lv">OpenVPN klients</name>
<name xml:lang="pl">Klient OpenVPN</name>
<name xml:lang="pt_BR">Cliente OpenVPN</name>
<name xml:lang="ru">Клиент OpenVPN</name>
<name xml:lang="sr">ОпенВПН клијент</name>
<name xml:lang="sr@latin">OpenVPN klijent</name>
<name xml:lang="sv">OpenVPN-klient</name>
<summary>Client for OpenVPN virtual private networks</summary>
<summary xml:lang="ca">Client per a xarxes privades virtuals OpenVPN</summary>
<summary xml:lang="cs">Klient pro virtální soukromé sítě OpenVPN</summary>
<summary xml:lang="cs">Klient pro virtuální soukromé sítě OpenVPN</summary>
<summary xml:lang="da">Klient til virtuelle private OpenVPN-netværk</summary>
<summary xml:lang="de">Client für virtuelle private OpenVPN-Netzwerke</summary>
<summary xml:lang="es">Cliente para redes privadas virtuales OpenVPN</summary>
<summary xml:lang="fi">Asiakasohjelmisto OpenVPN-erillisverkkoihin</summary>
<summary xml:lang="gl">Cliente para redes privadas virtuais OpenVPN</summary>
<summary xml:lang="hu">Kliens az OpenVPN virtuális magánhálózatokhoz</summary>
<summary xml:lang="id">Klien untuk virtual private network OpenVPN</summary>
<summary xml:lang="it">Client per reti private virtuali OpenVPN</summary>
<summary xml:lang="lt">Klientas OpenVPN virtualiems privatiems tinklams</summary>
<summary xml:lang="lv">OpenVPN virtuālā privātā tīkla klients</summary>
<summary xml:lang="pl">Klient dla wirtualnych sieci prywatnych OpenVPN</summary>
<summary xml:lang="pt_BR">Cliente para redes privadas virtuais OpenVPN</summary>
<summary xml:lang="ru">Клиент для виртуальных частных сетей OpenVPN</summary>
<summary xml:lang="sr">Клијент за виртуелне приватне мреже кроз ОпенВПН</summary>
<summary xml:lang="sr@latin">Klijent za virtuelne privatne mreže kroz OpenVPN</summary>
<summary xml:lang="sv">Klient för OpenVPN virtuella privata nätverk</summary>
......@@ -56,12 +62,15 @@
<p xml:lang="de">Unterstützung für die Einrichtung virtueller privater OpenVPN-Netzwerkverbindungen.</p>
<p xml:lang="es">Soporte para configurar conexiones a redes privadas virtuales OpenVPN</p>
<p xml:lang="fi">Tuki OpenVPN-erillisverkkoyhteyksien määrittämiseen.</p>
<p xml:lang="gl">Asistencia para configurar as conexións da rede privada virtual OpenVPN.</p>
<p xml:lang="hu">Az OpenVPN virtuális magánhálózati kapcsolatok beállításának támogatása.</p>
<p xml:lang="id">Dukungan untuk menata koneksi virtual private network OpenVPN.</p>
<p xml:lang="it">Supporta la configurazione di connessioni a reti private virtuali OpenVPN.</p>
<p xml:lang="lt">OpenVPN virtualių privačių tinklų ryšių konfigūracijos palaikymas.</p>
<p xml:lang="lv">Atbalsts OpenVPN virtuālo privāto tīklu savienojumu konfigurēšanai.</p>
<p xml:lang="pl">Obsługa konfigurowania połączeń wirtualnych sieci prywatnych OpenVPN.</p>
<p xml:lang="pt_BR">Suporte a configuração conexões de rede privada virtual OpenVPN.</p>
<p xml:lang="ru">Поддержка настройки виртуальных частных сетевых соединений OpenVPN.</p>
<p xml:lang="sr">Подршка за подешавање повезивања у виртуелним приватним мрежама кроз ОпенВПН.</p>
<p xml:lang="sr@latin">Podrška za podešavanje povezivanja u virtuelnim privatnim mrežama kroz OpenVPN.</p>
<p xml:lang="sv">Stöd för att konfigurera OpenVPN virtuella privata nätverksanslutningar.</p>
......@@ -72,12 +81,15 @@
<p xml:lang="de">OpenVPN ist eine populäre, flexible und auf freier Software basierende VPN-Lösung.</p>
<p xml:lang="es">OpenVPN es una solución VPN flexible y popular, y además es software libre.</p>
<p xml:lang="fi">OpenVPN on suosittu ja monipuolinen sekä avoin VPN-ratkaisu.</p>
<p xml:lang="gl">OpenVPN é unha popular e flexíbel solución de software libre para VPN.</p>
<p xml:lang="hu">Az OpenVPN egy népszerű és rugalmas, szabad szoftveres VPN megoldás.</p>
<p xml:lang="id">OpenVPN adalah sebuah solusi VPN perangkat lunak bebas yang populer dan luwes.</p>
<p xml:lang="it">OpenVPN è una soluzione VPN basata su codice libero.</p>
<p xml:lang="lt">OpenVPN yra populiarus ir lankstus laisvos programinės įrangos VPN sprendimas.</p>
<p xml:lang="lv">OpenVPN ir populārs un elastīgs brīvās programmatūras VPN risinājums.</p>
<p xml:lang="pl">OpenVPN to popularne i elastyczne oprogramowanie VPN na wolnej licencji.</p>
<p xml:lang="pt_BR">OpenVPN é uma solução VPN popular e flexível de software livre.</p>
<p xml:lang="ru">OpenVPN — популярное и гибкое свободное программное обеспечение VPN.</p>
<p xml:lang="sr">ОпенВПН је популаран, прилагодљив и слободан програм за ВПН.</p>
<p xml:lang="sr@latin">OpenVPN je popularan, prilagodljiv i slobodan program za VPN.</p>
<p xml:lang="sv">OpenVPN är en populär och flexibel VPN-lösning som är fri programvara.</p>
......@@ -105,12 +117,15 @@
<developer_name xml:lang="el">Οι προγραμματιστές του NetworkManager</developer_name>
<developer_name xml:lang="es">Los desarrolladores de NetworkManager</developer_name>
<developer_name xml:lang="fi">NetworkManagerin kehittäjät</developer_name>
<developer_name xml:lang="gl">Os desenvolvedores do NetworkManager</developer_name>
<developer_name xml:lang="hu">A Hálózatkezelő fejlesztői</developer_name>
<developer_name xml:lang="id">Para Pengembang NetworkManager</developer_name>
<developer_name xml:lang="it">Gli sviluppatori di NetworkManager</developer_name>
<developer_name xml:lang="lt">NetworkManager kūrėjai</developer_name>
<developer_name xml:lang="lv">NetworkManager izstrādātāji</developer_name>
<developer_name xml:lang="pl">Programiści projektu NetworkManager</developer_name>
<developer_name xml:lang="pt_BR">Os desenvolvedores NetworkManager</developer_name>
<developer_name xml:lang="ru">Разработчики NetworkManager</developer_name>
<developer_name xml:lang="sr">Развојни тим Управника мреже</developer_name>
<developer_name xml:lang="sr@latin">Razvojni tim Upravnika mreže</developer_name>
<developer_name xml:lang="sv">Utvecklarna av Nätverkshanteraren</developer_name>
......
#! /bin/sh
#!/bin/sh
# Wrapper for compilers which do not understand '-c -o'.
scriptversion=2016-01-11.22; # UTC
......
#! /bin/sh
#!/bin/sh
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
......
#! /bin/sh
#!/bin/sh
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for NetworkManager-openvpn 1.8.2.
# Generated by GNU Autoconf 2.69 for NetworkManager-openvpn 1.8.4.
#
# Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>.
#
......@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NetworkManager-openvpn'
PACKAGE_TARNAME='NetworkManager-openvpn'
PACKAGE_VERSION='1.8.2'
PACKAGE_STRING='NetworkManager-openvpn 1.8.2'
PACKAGE_VERSION='1.8.4'
PACKAGE_STRING='NetworkManager-openvpn 1.8.4'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager'
PACKAGE_URL=''
......@@ -1419,7 +1419,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures NetworkManager-openvpn 1.8.2 to adapt to many kinds of systems.
\`configure' configures NetworkManager-openvpn 1.8.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1490,7 +1490,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of NetworkManager-openvpn 1.8.2:";;
short | recursive ) echo "Configuration of NetworkManager-openvpn 1.8.4:";;
esac
cat <<\_ACEOF
......@@ -1645,7 +1645,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
NetworkManager-openvpn configure 1.8.2
NetworkManager-openvpn configure 1.8.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2068,7 +2068,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by NetworkManager-openvpn $as_me 1.8.2, which was
It was created by NetworkManager-openvpn $as_me 1.8.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2931,7 +2931,7 @@ fi
# Define the identity of the package.
PACKAGE='NetworkManager-openvpn'
VERSION='1.8.2'
VERSION='1.8.4'
cat >>confdefs.h <<_ACEOF
......@@ -12930,7 +12930,7 @@ done
NM_GIT_SHA=2e270c959dbcf74fb015a045170c273d23ed1d75
NM_GIT_SHA=06fdd06e74b17f90054b09b1623b675993fb2070
if test """" != "no-config-h" ; then
......@@ -16296,7 +16296,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by NetworkManager-openvpn $as_me 1.8.2, which was
This file was extended by NetworkManager-openvpn $as_me 1.8.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -16362,7 +16362,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
NetworkManager-openvpn config.status 1.8.2
NetworkManager-openvpn config.status 1.8.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn,
1.8.2,
1.8.4,
https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 tar-ustar no-dist-gzip dist-xz])
......
#! /bin/sh
#!/bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2016-01-11.22; # UTC
......
......@@ -7272,10 +7272,12 @@ func_mode_link ()
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
# -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-specs=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
......
#! /bin/sh
#!/bin/sh
# Common wrapper for a few potentially missing GNU programs.
scriptversion=2016-01-11.22; # UTC
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -934,6 +934,29 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
continue;
}
if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_CRL_VERIFY)) {
const char *file;
gs_free char *file_free = NULL;
if (!args_params_check_nargs_minmax (params, 1, 2, &line_error))
goto handle_line_error;
if (!args_params_check_arg_nonempty (params, 1, NULL, &line_error))
goto handle_line_error;
if (params[2] && !nm_streq (params[2], "dir")) {
line_error = g_strdup_printf (_("unsupported crl-verify argument"));
goto handle_line_error;
}
file = params[1];
if (!g_path_is_absolute (file))
file = file_free = g_build_filename (default_path, file, NULL);
if (params[2])
setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_CRL_VERIFY_DIR, file);
else
setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_CRL_VERIFY_FILE, file);
}
if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_NS_CERT_TYPE)) {
if (!args_params_check_nargs_n (params, 1, &line_error))
goto handle_line_error;
......@@ -1939,6 +1962,15 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
args_write_line_setting_value_int (f, NMV_OVPN_TAG_FRAGMENT, s_vpn, NM_OPENVPN_KEY_FRAGMENT_SIZE);
value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CRL_VERIFY_FILE);
if (value)
args_write_line (f, NMV_OVPN_TAG_CRL_VERIFY, value);
else {
value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_CRL_VERIFY_DIR);
if (value)
args_write_line (f, NMV_OVPN_TAG_CRL_VERIFY, value, "dir");
}
{
gs_free char *device_free = NULL;
const char *device_type, *device;
......
......@@ -1614,6 +1614,59 @@ config: auth</property>
<property name="top_attach">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="crl_file_check">
<property name="label" translatable="yes">Verify CRL from file</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Check peer certificate against the specified file in PEM format. A CRL (certificate revocation list) is used when a particular key is compromised but when the overall PKI is still intact.</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="crl_dir_check">
<property name="label" translatable="yes">Verify CRL from directory</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Check peer certificate by looking at files in the specified directory. The directory must contain files named as revoked serial numbers (the files may be empty, the contents are never read).</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">4</property>
</packing>
</child>
<child>
<object class="GtkFileChooserButton" id="crl_file_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Check peer certificate against the specified file in PEM format. A CRL (certificate revocation list) is used when a particular key is compromised but when the overall PKI is still intact.</property>
<property name="title" translatable="yes">Choose CRL file</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkFileChooserButton" id="crl_dir_chooser">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Check peer certificate by looking at files in the specified directory. The directory must contain files named as revoked serial numbers (the files may be empty, the contents are never read).</property>
<property name="action">select-folder</property>
<property name="title" translatable="yes">Choose CRL directory</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">4</property>
</packing>
</child>
</object>
</child>
</object>
......@@ -2369,9 +2422,9 @@ config: http-proxy-retry or socks-proxy-retry</property>
<property name="label" translatable="yes">Connect timeout</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">The timeout in seconds before trying the next server. This timeout includes proxy and TCP connect timeouts.
config: connect-timeout &lt;n&gt; | server-poll-timeout &lt;n&gt;</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
</object>
<packing>
......
......@@ -686,6 +686,8 @@ static const char *advanced_keys[] = {
NM_OPENVPN_KEY_CIPHER,
NM_OPENVPN_KEY_COMP_LZO,
NM_OPENVPN_KEY_CONNECT_TIMEOUT,
NM_OPENVPN_KEY_CRL_VERIFY_DIR,
NM_OPENVPN_KEY_CRL_VERIFY_FILE,
NM_OPENVPN_KEY_DEV,
NM_OPENVPN_KEY_DEV_TYPE,
NM_OPENVPN_KEY_EXTRA_CERTS,
......@@ -1332,6 +1334,36 @@ device_name_changed_cb (GtkEntry *entry,
return FALSE;
}
static void
crl_file_checkbox_toggled_cb (GtkWidget *check, gpointer user_data)
{
GtkBuilder *builder = (GtkBuilder *) user_data;
GtkWidget *other, *combo;
other = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_check"));
combo = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_chooser"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))) {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (other), FALSE);
gtk_widget_set_sensitive (combo, TRUE);
} else
gtk_widget_set_sensitive (combo, FALSE);
}
static void
crl_dir_checkbox_toggled_cb (GtkWidget *check, gpointer user_data)
{
GtkBuilder *builder = (GtkBuilder *) user_data;
GtkWidget *other, *combo;
other = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_check"));
combo = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_chooser"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))) {
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (other), FALSE);
gtk_widget_set_sensitive (combo, TRUE);
} else
gtk_widget_set_sensitive (combo, FALSE);
}
static void
dev_checkbox_toggled_cb (GtkWidget *check, gpointer user_data)
{
......@@ -1756,6 +1788,29 @@ advanced_dialog_new (GHashTable *hash, const char *contype)
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (mtu_disc_toggled_cb), builder);
mtu_disc_toggled_cb (widget, builder);
/* CRL */
value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_CRL_VERIFY_FILE);
if (value) {
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_check"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_chooser"));
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
} else {
value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_CRL_VERIFY_DIR);
if (value) {
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_check"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_chooser"));
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), value);
}
}
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_check"));
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (crl_file_checkbox_toggled_cb), builder);
crl_file_checkbox_toggled_cb (widget, builder);
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_check"));
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (crl_dir_checkbox_toggled_cb), builder);
crl_dir_checkbox_toggled_cb (widget, builder);
value = g_hash_table_lookup (hash, NM_OPENVPN_KEY_MAX_ROUTES);
_builder_init_optional_spinbutton (builder, "max_routes_checkbutton", "max_routes_spinbutton", !!value,
_nm_utils_ascii_str_to_int64 (value, 10, 0, 100000000, 100));
......@@ -2126,6 +2181,29 @@ advanced_dialog_new_hash_from_dialog (GtkWidget *dialog, GError **error)
}
}
/* CRL */
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_check"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
char *filename;
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_file_chooser"));
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
if (filename && filename[0])
g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_CRL_VERIFY_FILE), g_strdup (filename));
g_free (filename);
} else {
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_check"));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) {
char *filename;
widget = GTK_WIDGET (gtk_builder_get_object (builder, "crl_dir_chooser"));
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
if (filename && filename[0])
g_hash_table_insert (hash, g_strdup (NM_OPENVPN_KEY_CRL_VERIFY_DIR), g_strdup (filename));
g_free (filename);
}
}
return hash;
}
......
This diff is collapsed.
port 2345
remote 173.8.149.245
resolv-retry infinite
dev tun
persist-key
persist-tun
link-mtu 1400
proto udp
nobind
pull
tls-client
ca keys/mg8.ca
cert keys/clee.crt
key keys/clee.key
comp-lzo
verb 3
crl-verify /home/user/.cert/crls/ dir
\ No newline at end of file
port 2345
remote 173.8.149.245
resolv-retry infinite
dev tun
persist-key
persist-tun
link-mtu 1400
proto udp
nobind
pull
tls-client
ca keys/mg8.ca
cert keys/clee.crt
key keys/clee.key
comp-lzo
verb 3
crl-verify /home/user/.cert/crl.pem
\ No newline at end of file
This diff is collapsed.
......@@ -35,6 +35,8 @@
#define NM_OPENVPN_KEY_COMP_LZO "comp-lzo"
#define NM_OPENVPN_KEY_CONNECTION_TYPE "connection-type"
#define NM_OPENVPN_KEY_CONNECT_TIMEOUT "connect-timeout"
#define NM_OPENVPN_KEY_CRL_VERIFY_FILE "crl-verify-file"
#define NM_OPENVPN_KEY_CRL_VERIFY_DIR "crl-verify-dir"
#define NM_OPENVPN_KEY_DEV "dev"
#define NM_OPENVPN_KEY_DEV_TYPE "dev-type"
#define NM_OPENVPN_KEY_EXTRA_CERTS "extra-certs"
......
......@@ -31,6 +31,7 @@
#define NMV_OVPN_TAG_CLIENT "client"
#define NMV_OVPN_TAG_COMP_LZO "comp-lzo"
#define NMV_OVPN_TAG_CONNECT_TIMEOUT "connect-timeout"
#define NMV_OVPN_TAG_CRL_VERIFY "crl-verify"
#define NMV_OVPN_TAG_DEV "dev"
#define NMV_OVPN_TAG_DEV_TYPE "dev-type"
#define NMV_OVPN_TAG_EXTRA_CERTS "extra-certs"
......
This diff is collapsed.
#! /bin/sh
#!/bin/sh
# test-driver - basic testsuite driver script.
scriptversion=2016-01-11.22; # UTC
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment