Commit 57fa7db3 authored by Michael Biebl's avatar Michael Biebl

New upstream version 1.2.10

parent c6aca638
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
=======================================================
NetworkManagerg-openvpn-1.2.8
NetworkManager-openvpn-1.2.10
Overview of changes since NetworkManager-openvpn-1.2.8
=======================================================
This is a new stable release of NetworkManager-openvpn. Notable changes include:
* Add support for "tls-crypt" and "mtu-disc" options
* Add support for dynamic challenge-response protocol
* Allow choosing Adaptive or None LZO compression methods in the connection
properties dialog
* Avoid passing the obsolete "tls-remote" option to OpenVPN versions that no
longer support it and discourage its use in the properties dialog
* Updated the build system to use non-recursive make
* Many bug fixes
* Updated Brazilian, Danish, Hungarian, Indonesian, Lithuanian, Polish, Serbian
and Swedish translations
=======================================================
NetworkManager-openvpn-1.2.8
Overview of changes since NetworkManager-openvpn-1.2.6
=======================================================
......@@ -11,7 +29,7 @@ This is a new stable release of NetworkManager-openvpn. Notable changes include
* Updated Czech, German, Hungarian, Polish, Spanish translations
=======================================================
NetworkManagerg-openvpn-1.2.6
NetworkManager-openvpn-1.2.6
Overview of changes since NetworkManager-openvpn-1.2.4
=======================================================
......@@ -26,7 +44,7 @@ This is a new stable release of NetworkManager-openvpn. Notable changes include
* Various cleanups
=======================================================
NetworkManagerg-openvpn-1.2.4
NetworkManager-openvpn-1.2.4
Overview of changes since NetworkManager-openvpn-1.2.2
=======================================================
......@@ -49,7 +67,7 @@ This is a new stable release of NetworkManager-openvpn. Notable changes include
=======================================================
NetworkManagerg-openvpn-1.2.2
NetworkManager-openvpn-1.2.2
Overview of changes since NetworkManager-openvpn-1.2
=======================================================
......@@ -61,7 +79,7 @@ This is a new stable release of NetworkManager-openvpn. Notable changes include
=======================================================
NetworkManagerg-openvpn-1.2
NetworkManager-openvpn-1.2
Overview of changes since network-manager-openvpn-1.0
=======================================================
......
......@@ -1932,6 +1932,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/attributes.m4])
m4_include([m4/compiler_options.m4])
m4_include([m4/git-sha-record.m4])
m4_include([m4/intltool.m4])
......
......@@ -7,6 +7,7 @@
<extends>gnome-control-center.desktop</extends>
<name>OpenVPN client</name>
<name xml:lang="cs">Klient OpenVPN</name>
<name xml:lang="da">OpenVPN-klient</name>
<name xml:lang="de">OpenVPN-Client</name>
<name xml:lang="el">Πελάτης OpenVPN</name>
<name xml:lang="es">Cliente de OpenVPN</name>
......@@ -20,6 +21,7 @@
<name xml:lang="sv">OpenVPN-klient</name>
<summary>Client for OpenVPN virtual private networks</summary>
<summary xml:lang="cs">Klient pro virtá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="hu">Kliens az OpenVPN virtuális magánhálózatokhoz</summary>
......@@ -43,6 +45,7 @@
<description>
<p>Support for configuring OpenVPN virtual private network connections.</p>
<p xml:lang="cs">Podpora nastavení sítí OpenVPN.</p>
<p xml:lang="da">Understøttelse af konfigurering af virtuelle private OpenVPN-netværksforbindelser.</p>
<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="hu">Az OpenVPN virtuális magánhálózati kapcsolatok beállításának támogatása.</p>
......@@ -55,6 +58,7 @@
<p xml:lang="sv">Stöd för att konfigurera OpenVPN virtuella privata nätverksanslutningar.</p>
<p>OpenVPN is a popular and flexible free-software VPN solution.</p>
<p xml:lang="cs">OpenVPN je populární a flexibilní nekomerční softwarové řešení VPN.</p>
<p xml:lang="da">OpenVPN er en fri, populær og fleksibel VPN-løsning.</p>
<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="hu">Az OpenVPN egy népszerű és rugalmas, szabad szoftveres VPN megoldás.</p>
......@@ -83,6 +87,7 @@
<translation type="gettext">NetworkManager-openvpn</translation>
<developer_name>The NetworkManager Developers</developer_name>
<developer_name xml:lang="cs">Vývojáři aplikace NetworkManager</developer_name>
<developer_name xml:lang="da">Udviklerne af Netværkshåndtering</developer_name>
<developer_name xml:lang="de">Die NetworkManager-Entwickler</developer_name>
<developer_name xml:lang="el">Οι προγραμματιστές του NetworkManager</developer_name>
<developer_name xml:lang="es">Los desarrolladores de NetworkManager</developer_name>
......
libexec_PROGRAMS = nm-openvpn-auth-dialog
nm_openvpn_auth_dialog_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS) \
$(LIBSECRET_CFLAGS) \
-I$(top_srcdir)/shared \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
nm_openvpn_auth_dialog_SOURCES = \
$(top_srcdir)/shared/utils.c \
$(top_srcdir)/shared/utils.h \
main.c
nm_openvpn_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS) \
$(LIBSECRET_LIBS)
CLEANFILES = *~
This diff is collapsed.
This diff is collapsed.
AC_PREREQ(2.52)
AC_INIT(NetworkManager-openvpn,
1.2.8,
1.2.10,
https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager,
NetworkManager-openvpn)
AM_INIT_AUTOMAKE([1.9 tar-ustar no-dist-gzip dist-xz])
AM_MAINTAINER_MODE
AM_SILENT_RULES([yes])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
dnl Prefer gcc-* variants; the ones libtool would choose don't work with LTO
AC_CHECK_TOOLS(AR, [gcc-ar ar], false)
AC_CHECK_TOOLS(RANLIB, [gcc-ranlib ranlib], :)
LT_INIT([disable-static])
dnl
dnl Require programs
dnl
......@@ -91,11 +98,7 @@ if test x"$with_gnome" != xno; then
GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4"
PKG_CHECK_MODULES(LIBNMA, libnma >= 1.2.0)
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18, [], [
dnl We use the secret service API that went stable in 0.18
PKG_CHECK_MODULES(LIBSECRET, libsecret-unstable)
LIBSECRET_CFLAGS="$LIBSECRET_CFLAGS -DSECRET_API_SUBJECT_TO_CHANGE"
])
PKG_CHECK_MODULES(LIBSECRET, libsecret-1 >= 0.18)
if test x"$with_libnm_glib" != xno; then
PKG_CHECK_MODULES(LIBNM_GTK, libnm-gtk >= 1.2.0)
......@@ -118,6 +121,8 @@ NM_VPN_SERVICE_DIR=`$PKG_CONFIG --define-variable prefix='\${prefix}' --variable
AC_SUBST(NM_VPN_SERVICE_DIR)
NM_COMPILER_WARNINGS([yes])
NM_LTO
NM_LD_GC
NM_PLUGIN_DIR="$libdir/NetworkManager"
AC_SUBST(NM_PLUGIN_DIR)
......@@ -139,13 +144,7 @@ fi
AC_CONFIG_FILES([
Makefile
src/Makefile
auth-dialog/Makefile
properties/Makefile
properties/tests/Makefile
properties/tests/conf/Makefile
po/Makefile.in
shared/Makefile
])
AC_OUTPUT
......@@ -155,3 +154,6 @@ echo " --with-gnome=$with_gnome"
echo " --with-libnm-glib=$with_libnm_glib"
echo " --enable-absolute-paths=$enable_absolute_paths"
echo " --enable-more-warnings=$set_more_warnings"
echo " --enable-lto=$enable_lto"
echo " --enable-ld-gc=$enable_ld_gc"
echo ""
{
global:
_IO_stdin_used;
local:
*;
};
This diff is collapsed.
......@@ -61,16 +61,31 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
fi
for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
-Wdeclaration-after-statement -Wformat-security \
-Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-Wno-duplicate-decl-specifier \
for option in \
-Wextra \
-Wdeclaration-after-statement \
-Wfloat-equal \
-Wformat-nonliteral \
-Wformat-security \
-Wimplicit-fallthrough \
-Wimplicit-function-declaration \
-Winit-self \
-Wmissing-declarations \
-Wmissing-include-dirs \
-Wmissing-prototypes \
-Wpointer-arith \
-Wshadow \
-Wstrict-prototypes \
-Wno-unused-but-set-variable \
-Wundef \
-Wno-duplicate-decl-specifier \
-Wno-format-truncation \
-Wno-format-y2k \
-Wundef -Wimplicit-function-declaration \
-Wpointer-arith -Winit-self -Wformat-nonliteral \
-Wmissing-include-dirs -Wno-pragmas; do
-Wno-missing-field-initializers \
-Wno-pragmas \
-Wno-sign-compare \
-Wno-unused-but-set-variable \
-Wno-unused-parameter \
; do
dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning)
_NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [],
[CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"], [])
......@@ -109,3 +124,35 @@ else
AC_MSG_RESULT(no)
fi
])
AC_DEFUN([NM_LTO],
[AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
if (test "${enable_lto}" = "yes"); then
CC_CHECK_FLAG_APPEND([lto_flags], [CFLAGS], [-flto])
if (test -n "${lto_flags}"); then
CFLAGS="-flto $CFLAGS"
else
AC_MSG_ERROR([Link Time Optimization -flto is not supported.])
fi
else
enable_lto='no'
fi
])
AC_DEFUN([NM_LD_GC],
[AC_ARG_ENABLE(ld-gc, AS_HELP_STRING([--enable-ld-gc], [Enable garbage collection of unused symbols on linking (default: auto)]))
if (test "${enable_ld_gc}" != "no"); then
CC_CHECK_FLAG_APPEND([ld_gc_flags], [CFLAGS], [-fdata-sections -ffunction-sections -Wl,--gc-sections])
if (test -n "${ld_gc_flags}"); then
enable_ld_gc="yes"
CFLAGS="$ld_gc_flags $CFLAGS"
else
if (test "${enable_ld_gc}" = "yes"); then
AC_MSG_ERROR([Unused symbol eviction requested but not supported.])
else
enable_ld_gc="no"
fi
fi
fi
])
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.
SUBDIRS = . tests
plugindir = $(libdir)/NetworkManager
plugin_LTLIBRARIES = libnm-vpn-plugin-openvpn.la
if WITH_GNOME
plugin_LTLIBRARIES += libnm-vpn-plugin-openvpn-editor.la
if WITH_LIBNM_GLIB
plugin_LTLIBRARIES += libnm-openvpn-properties.la
endif
endif
shared_sources = \
$(top_srcdir)/shared/nm-utils/nm-shared-utils.c \
$(top_srcdir)/shared/nm-utils/nm-shared-utils.h \
$(top_srcdir)/shared/utils.c \
$(top_srcdir)/shared/utils.h \
$(top_srcdir)/shared/nm-service-defines.h \
$(NULL)
plugin_sources = \
nm-openvpn-editor-plugin.c \
nm-openvpn-editor-plugin.h \
import-export.c \
import-export.h
editor_sources = \
nm-openvpn-editor.c \
nm-openvpn-editor.h \
auth-helpers.c \
auth-helpers.h
uidir = $(datadir)/gnome-vpn-properties/openvpn
if WITH_GNOME
ui_DATA = nm-openvpn-dialog.ui
endif
common_CFLAGS = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/shared \
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DLOCALEDIR=\"$(datadir)/locale\"
###############################################################################
libnm_vpn_plugin_openvpn_la_SOURCES = \
$(shared_sources) \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.c \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-utils.h \
$(top_srcdir)/shared/nm-utils/nm-vpn-plugin-macros.h \
$(plugin_sources)
libnm_vpn_plugin_openvpn_la_CFLAGS = \
$(common_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
-DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
$(LIBNM_CFLAGS)
libnm_vpn_plugin_openvpn_la_LIBADD = \
$(LIBNM_LIBS) \
$(DL_LIBS) \
$(NULL)
libnm_vpn_plugin_openvpn_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script=$(srcdir)/libnm-vpn-plugin-openvpn.ver
###############################################################################
libnm_vpn_plugin_openvpn_editor_la_SOURCES = \
$(shared_sources) \
$(editor_sources)
libnm_vpn_plugin_openvpn_editor_la_CFLAGS = \
$(common_CFLAGS) \
$(GTK_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \
$(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS)
libnm_vpn_plugin_openvpn_editor_la_LIBADD = \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS)
libnm_vpn_plugin_openvpn_editor_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script=$(srcdir)/libnm-vpn-plugin-openvpn-editor.ver
###############################################################################
libnm_openvpn_properties_la_SOURCES = \
$(shared_sources) \
$(plugin_sources) \
$(editor_sources)
libnm_openvpn_properties_la_CFLAGS = \
-DNM_VPN_OLD \
$(common_CFLAGS) \
$(GTK_CFLAGS) \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
$(LIBNM_GLIB_CFLAGS) \
$(LIBNM_GTK_CFLAGS)
libnm_openvpn_properties_la_LIBADD = \
$(GTK_LIBS) \
$(LIBNM_GLIB_LIBS) \
$(LIBNM_GTK_LIBS)
libnm_openvpn_properties_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script=$(srcdir)/libnm-openvpn-properties.ver
###############################################################################
libnm_vpn_plugin_openvpn_test_la_SOURCES = $(libnm_vpn_plugin_openvpn_la_SOURCES)
libnm_vpn_plugin_openvpn_test_la_CFLAGS = $(libnm_vpn_plugin_openvpn_la_CFLAGS)
libnm_vpn_plugin_openvpn_test_la_LIBADD = $(libnm_vpn_plugin_openvpn_la_LIBADD)
libnm_vpn_plugin_openvpn_test_la_LDFLAGS = \
-avoid-version
libnm_openvpn_properties_test_la_SOURCES = $(libnm_openvpn_properties_la_SOURCES)
libnm_openvpn_properties_test_la_CFLAGS = $(libnm_openvpn_properties_la_CFLAGS)
libnm_openvpn_properties_test_la_LIBADD = $(libnm_openvpn_properties_la_LIBADD)
libnm_openvpn_properties_test_la_LDFLAGS = \
-avoid-version
###############################################################################
noinst_LTLIBRARIES = \
libnm-vpn-plugin-openvpn-test.la
if WITH_LIBNM_GLIB
noinst_LTLIBRARIES += libnm-openvpn-properties-test.la
endif
CLEANFILES = *.bak *~
EXTRA_DIST = \
libnm-vpn-plugin-openvpn.ver \
libnm-vpn-plugin-openvpn-editor.ver \
libnm-openvpn-properties.ver \
nm-openvpn-dialog.ui
This diff is collapsed.
This diff is collapsed.
......@@ -44,6 +44,7 @@
#define INLINE_BLOB_PKCS12 "pkcs12"
#define INLINE_BLOB_SECRET "secret"
#define INLINE_BLOB_TLS_AUTH "tls-auth"
#define INLINE_BLOB_TLS_CRYPT "tls-crypt"
const char *_nmovpn_test_temp_path = NULL;
......@@ -925,6 +926,17 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
continue;
}
if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_MTU_DISC)) {
if (!args_params_check_nargs_n (params, 1, &line_error))
goto handle_line_error;
if (!NM_IN_STRSET (params[1], "no", "maybe", "yes")) {
line_error = g_strdup_printf (_("unsupported mtu-disc argument"));
goto handle_line_error;
}
setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_MTU_DISC, params[1]);
continue;
}
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;
......@@ -1155,7 +1167,8 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
NMV_OVPN_TAG_CERT,
NMV_OVPN_TAG_KEY,
NMV_OVPN_TAG_SECRET,
NMV_OVPN_TAG_TLS_AUTH)) {
NMV_OVPN_TAG_TLS_AUTH,
NMV_OVPN_TAG_TLS_CRYPT)) {
const char *file;
gs_free char *file_free = NULL;
gboolean can_have_direction;
......@@ -1200,7 +1213,9 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
setting_vpn_add_data_item_path (s_vpn, NM_OPENVPN_KEY_TA, file);
if (s_direction)
setting_vpn_add_data_item (s_vpn, NM_OPENVPN_KEY_TA_DIR, s_direction);
} else
} else if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_TLS_CRYPT))
setting_vpn_add_data_item_path (s_vpn, NM_OPENVPN_KEY_TLS_CRYPT, file);
else
g_assert_not_reached ();
continue;
}
......@@ -1256,7 +1271,7 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
}
if (NM_IN_STRSET (params[0], NMV_OVPN_TAG_VERIFY_X509_NAME)) {
const char *type = "subject";
const char *type = NM_OPENVPN_VERIFY_X509_NAME_TYPE_SUBJECT;
gs_free char *item = NULL;
if (!args_params_check_nargs_minmax (params, 1, 2, &line_error))
......@@ -1387,6 +1402,7 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
gs_free char *end_token = NULL;
gsize end_token_len;
gsize my_contents_cur_line = contents_cur_line;
gboolean is_base64 = FALSE;
char *f_path;
const char *key;
gboolean can_have_direction = FALSE;
......@@ -1399,8 +1415,11 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
key = NM_OPENVPN_KEY_CERT;
else if (nm_streq (token, INLINE_BLOB_KEY))
key = NM_OPENVPN_KEY_KEY;
else if (nm_streq (token, INLINE_BLOB_PKCS12))
else if (nm_streq (token, INLINE_BLOB_PKCS12)) {
is_base64 = TRUE;
key = NULL;
} else if (nm_streq (token, INLINE_BLOB_TLS_CRYPT))
key = NM_OPENVPN_KEY_TLS_CRYPT;
else if (nm_streq (token, INLINE_BLOB_TLS_AUTH)) {
key = NM_OPENVPN_KEY_TA;
can_have_direction = TRUE;
......@@ -1442,6 +1461,15 @@ do_import (const char *path, const char *contents, gsize contents_len, GError **
goto handle_line_error;
}
if (is_base64) {
gs_free guint8 *d = NULL;
gsize l;
d = g_base64_decode (blob_data->str, &l);
g_string_truncate (blob_data, 0);
g_string_append_len (blob_data, (const char *) d, l);
}
/* the latest cert wins... */
for (sl_iter = inline_blobs; sl_iter; sl_iter = sl_iter->next) {
InlineBlobData *d = sl_iter->data;
......@@ -1882,6 +1910,8 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
else if (value)
args_write_line_setting_value_int (f, NMV_OVPN_TAG_MSSFIX, s_vpn, NM_OPENVPN_KEY_MSSFIX);
args_write_line_setting_value (f, NMV_OVPN_TAG_MTU_DISC, s_vpn, NM_OPENVPN_KEY_MTU_DISC);
args_write_line_setting_value_int (f, NMV_OVPN_TAG_TUN_MTU, s_vpn, NM_OPENVPN_KEY_TUNNEL_MTU);
args_write_line_setting_value_int (f, NMV_OVPN_TAG_FRAGMENT, s_vpn, NM_OPENVPN_KEY_FRAGMENT_SIZE);
......@@ -1924,7 +1954,7 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
if (NM_IN_STRSET (connection_type,
NM_OPENVPN_CONTYPE_TLS,
NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
const char *x509_name, *ta_key;
const char *x509_name, *key;
args_write_line_setting_value (f, NMV_OVPN_TAG_REMOTE_CERT_TLS, s_vpn, NM_OPENVPN_KEY_REMOTE_CERT_TLS);
args_write_line_setting_value (f, NMV_OVPN_TAG_NS_CERT_TYPE, s_vpn, NM_OPENVPN_KEY_NS_CERT_TYPE);
......@@ -1945,15 +1975,23 @@ do_export_create (NMConnection *connection, const char *path, GError **error)
args_write_line (f, NMV_OVPN_TAG_VERIFY_X509_NAME, name, type);
}
ta_key = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA);
if (_arg_is_set (ta_key)) {
key = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA);
if (_arg_is_set (key)) {
gs_free char *s_free = NULL;
args_write_line (f,
NMV_OVPN_TAG_TLS_AUTH,
nmv_utils_str_utf8safe_unescape_c (ta_key, &s_free),
nmv_utils_str_utf8safe_unescape_c (key, &s_free),
_arg_is_set (nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TA_DIR)));
}
key = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_CRYPT);
if (_arg_is_set (key)) {
gs_free char *s_free = NULL;
args_write_line (f,
NMV_OVPN_TAG_TLS_CRYPT,
nmv_utils_str_utf8safe_unescape_c (key, &s_free));
}
}
proxy_type = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_PROXY_TYPE);
......@@ -2093,4 +2131,3 @@ do_export (const char *path, NMConnection *connection, GError **error)
return TRUE;
}
This diff is collapsed.
SUBDIRS = conf
AM_CFLAGS = \
-I${top_srcdir}/shared \
-I${top_srcdir}/properties \
-DTEST_SRCDIR="\"$(abs_srcdir)\"" \
-DTEST_BUILDDIR="\"$(abs_builddir)\""
noinst_PROGRAMS = \
test-import-export
if WITH_LIBNM_GLIB
noinst_PROGRAMS += test-import-export-glib
endif
test_import_export_SOURCES = \
test-import-export.c
test_import_export_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS)
test_import_export_LDADD = \
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS) \
$(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la
test_import_export_glib_SOURCES = \
test-import-export.c
test_import_export_glib_CPPFLAGS = \
-DNM_VPN_OLD \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBNM_GLIB_CFLAGS) \
$(LIBNM_GTK_CFLAGS)
test_import_export_glib_LDADD = \
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(LIBNM_GLIB_LIBS) \
$(LIBNM_GTK_LIBS) \
$(top_builddir)/properties/libnm-openvpn-properties-test.la
TESTS = \
test-import-export
if WITH_LIBNM_GLIB
TESTS += test-import-export-glib
endif
This diff is collapsed.
EXTRA_DIST = \
iso885915.ovpn \
password.conf \
pkcs12.ovpn \
port.ovpn \
rport.ovpn \
static.key \
static.ovpn \
tls.ovpn \
tun-opts.conf \
proxy-http.ovpn \
httpauthfile \
proxy-socks.ovpn \
proxy-http-with-auth.ovpn \
keysize.ovpn \
device.ovpn \
device-notype.ovpn \
keepalive.ovpn \
ping-with-exit.ovpn \
ping-with-restart.ovpn \
route.ovpn \
tls-inline.ovpn \
tls-inline-ca.pem \
tls-inline-cert.pem \
tls-inline-key.pem \
tls-inline-ta.pem
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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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