diff options
| author | Saurav Babu <saurav.babu@samsung.com> | 2017-09-05 12:29:22 +0530 |
|---|---|---|
| committer | taesub kim <taesub.kim@samsung.com> | 2017-09-06 18:13:57 +0900 |
| commit | 8a710a99ee657f58e1bd821ba38f9127d50d503d (patch) | |
| tree | bc04107d27e1e2644fb53a9c5da92e6fccb83867 /gweb | |
| parent | 3d0ca0a714f54909a7c0afe5f2fc45a8468b3486 (diff) | |
| download | connman-8a710a99ee657f58e1bd821ba38f9127d50d503d.tar.gz connman-8a710a99ee657f58e1bd821ba38f9127d50d503d.tar.bz2 connman-8a710a99ee657f58e1bd821ba38f9127d50d503d.zip | |
Remove gnutls dependency from connmansubmit/tizen_4.0/20170906.092254accepted/tizen/4.0/unified/20170907.194547
gnutls dependency is only required when wispr is enabled. Currently
connman is build with flag --disable-wispr so gnutls is not required.
This patch removes gnutls dependency from spec file.
We'll find alternative for gnutls later and add that together with
patches related to captive portal
Change-Id: I23491ec67c365b4bc89c6231cc0a581431208f5a
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
Diffstat (limited to 'gweb')
| -rwxr-xr-x | gweb/giognutls.c | 14 | ||||
| -rwxr-xr-x | gweb/gweb.c | 3 |
2 files changed, 0 insertions, 17 deletions
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"); |