summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaesub kim <taesub.kim@samsung.com>2017-09-06 09:15:24 +0000
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>2017-09-06 09:15:24 +0000
commitc98b80f557bad82b6f9f671fc7a8505e3137fb5e (patch)
treebc04107d27e1e2644fb53a9c5da92e6fccb83867
parenta03571e8e2cfe741a0780ef542b666fd2b3013ec (diff)
parent9e3b1931585c316b741f4daac44511f856d6ca77 (diff)
downloadconnman-c98b80f557bad82b6f9f671fc7a8505e3137fb5e.tar.gz
connman-c98b80f557bad82b6f9f671fc7a8505e3137fb5e.tar.bz2
connman-c98b80f557bad82b6f9f671fc7a8505e3137fb5e.zip
Merge "Remove gnutls dependency from connman" into tizensubmit/tizen/20170906.091754accepted/tizen/unified/20170907.060402
-rwxr-xr-xMakefile.am15
-rwxr-xr-xconfigure.ac5
-rwxr-xr-xgweb/giognutls.c14
-rwxr-xr-xgweb/gweb.c3
-rwxr-xr-xpackaging/connman.spec3
5 files changed, 7 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index cadd787d..82c13dd8 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,6 @@ src_connmand_SOURCES = $(gdhcp_sources) $(gweb_sources) \
src_connmand_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) \
@GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \
- @TPKP_GNUTLS_LIBS@ \
-lresolv -ldl -lrt
src_connmand_LDFLAGS = -Wl,--export-dynamic -pie \
@@ -178,7 +177,7 @@ vpn_connman_vpnd_SOURCES = $(gdhcp_sources) $(builtin_vpn_sources) \
vpn_connman_vpnd_LDADD = gdbus/libgdbus-internal.la $(builtin_vpn_libadd) \
@GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ @GNUTLS_LIBS@ \
- @TPKP_GNUTLS_LIBS@ @LIBSYSTEMD_LIBS@ \
+ @LIBSYSTEMD_LIBS@ \
-lresolv -ldl
vpn_connman_vpnd_LDFLAGS = -Wl,--export-dynamic \
@@ -224,7 +223,7 @@ endif
endif
AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @LIBSYSTEMD_CFLAGS@\
- @GNUTLS_CFLAGS@ @TPKP_GNUTLS_CFLAGS@ $(builtin_cflags) \
+ @GNUTLS_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
-DSTATEDIR=\""$(statedir)"\" \
-DVPN_STATEDIR=\""$(vpn_statedir)"\" \
@@ -236,13 +235,13 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ @LIBSYSTEMD_CFLAGS@\
-fPIE
if VPN
-AM_CPPFLAGS = @TPKP_GNUTLS_CFLAGS@ -I$(builddir)/include -I$(srcdir)/gdbus
+AM_CPPFLAGS = -I$(builddir)/include -I$(srcdir)/gdbus
else
-AM_CPPFLAGS = @TPKP_GNUTLS_CFLAGS@ -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
+AM_CPPFLAGS = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
endif
src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
- @GNUTLS_CFLAGS@ @TPKP_GNUTLS_CFLAGS@ $(builtin_cflags) \
+ @GNUTLS_CFLAGS@ $(builtin_cflags) \
-DCONNMAN_PLUGIN_BUILTIN \
-DSTATEDIR=\""$(statedir)"\" \
-DPLUGINDIR=\""$(build_plugindir)"\" \
@@ -309,7 +308,7 @@ if WISPR
noinst_PROGRAMS += tools/wispr
tools_wispr_SOURCES = $(gweb_sources) tools/wispr.c
-tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ @TPKP_GNUTLS_LIBS@ -lresolv
+tools_wispr_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
endif
if TOOLS
@@ -329,7 +328,7 @@ tools_supplicant_test_LDADD = gdbus/libgdbus-internal.la \
@GLIB_LIBS@ @DBUS_LIBS@
tools_web_test_SOURCES = $(gweb_sources) tools/web-test.c
-tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ @TPKP_GNUTLS_LIBS@ -lresolv
+tools_web_test_LDADD = @GLIB_LIBS@ @GNUTLS_LIBS@ -lresolv
tools_resolv_test_SOURCES = gweb/gresolv.h gweb/gresolv.c tools/resolv-test.c
tools_resolv_test_LDADD = @GLIB_LIBS@ -lresolv
diff --git a/configure.ac b/configure.ac
index 5b6124e6..079114e7 100755
--- a/configure.ac
+++ b/configure.ac
@@ -302,11 +302,6 @@ PKG_CHECK_MODULES(XTABLES, xtables >= 1.4.11, dummy=yes,
AC_SUBST(XTABLES_CFLAGS)
AC_SUBST(XTABLES_LIBS)
-PKG_CHECK_MODULES(TPKP_GNUTLS, tpkp-gnutls, dummy=yes,
- AC_MSG_ERROR(tpkp-gnutls library is required))
-AC_SUBST(TPKP_GNUTLS_CFLAGS)
-AC_SUBST(TPKP_GNUTLS_LIBS)
-
AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test],
[enable test/example scripts]), [enable_test=${enableval}])
AM_CONDITIONAL(TEST, test "${enable_test}" = "yes")
diff --git a/gweb/giognutls.c b/gweb/giognutls.c
index 689bc52c..31cf9020 100755
--- a/gweb/giognutls.c
+++ b/gweb/giognutls.c
@@ -29,7 +29,6 @@
#include <unistd.h>
#include <gnutls/gnutls.h>
-#include <tpkp_gnutls.h>
#include "giognutls.h"
@@ -236,8 +235,6 @@ static void g_io_gnutls_free(GIOChannel *channel)
gnutls_deinit(gnutls_channel->session);
- tpkp_gnutls_cleanup();
-
gnutls_certificate_free_credentials(gnutls_channel->cred);
g_free(gnutls_channel);
@@ -465,17 +462,6 @@ GIOChannel *g_io_channel_gnutls_new(int fd)
gnutls_credentials_set(gnutls_channel->session,
GNUTLS_CRD_CERTIFICATE, gnutls_channel->cred);
-#if defined TIZEN_SYS_CA_BUNDLE
-#define QUOTEME(x) #x
- gnutls_certificate_set_verify_function(gnutls_channel->cred, &tpkp_gnutls_verify_callback);
- /*
- * TODO: get ca-bundle path build-time configuration unless gnutls set it as a default
- */
- DBG("tizen sys ca bundle : %s", QUOTEME(TIZEN_SYS_CA_BUNDLE));
- gnutls_certificate_set_x509_trust_file(gnutls_channel->cred,
- QUOTEME(TIZEN_SYS_CA_BUNDLE), GNUTLS_X509_FMT_PEM);
-#endif
-
DBG("channel %p", channel);
return channel;
diff --git a/gweb/gweb.c b/gweb/gweb.c
index b6d581c8..307164e9 100755
--- a/gweb/gweb.c
+++ b/gweb/gweb.c
@@ -39,8 +39,6 @@
#include <netinet/tcp.h>
#include <ifaddrs.h>
-#include <tpkp_gnutls.h>
-
#include "giognutls.h"
#include "gresolv.h"
#include "gweb.h"
@@ -1056,7 +1054,6 @@ static int connect_session_transport(struct web_session *session)
if (session->flags & SESSION_FLAG_USE_TLS) {
debug(session->web, "using TLS encryption");
- tpkp_gnutls_set_url_data(session->host);
session->transport_channel = g_io_channel_gnutls_new(sk);
} else {
debug(session->web, "no encryption");
diff --git a/packaging/connman.spec b/packaging/connman.spec
index b3111dac..0888d9d5 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -18,7 +18,6 @@ BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(libiptc)
BuildRequires: pkgconfig(xtables)
BuildRequires: pkgconfig(libsmack)
-BuildRequires: pkgconfig(tpkp-gnutls)
BuildRequires: pkgconfig(libsystemd-daemon)
%if %{with connman_openconnect}
BuildRequires: openconnect
@@ -30,7 +29,6 @@ BuildRequires: openvpn
BuildRequires: strongswan
BuildRequires: pkgconfig(openssl)
%endif
-BuildRequires: ca-certificates-devel
BuildRequires: readline-devel
#%systemd_requires
Requires: iptables
@@ -131,7 +129,6 @@ This overwrites conf file of %{name}.
%build
#CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
-CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_RO_CA_BUNDLE\""
%if %{with connman_vpnd}
VPN_CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"