summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhyunuktak <hyunuk.tak@samsung.com>2015-12-23 06:03:25 (GMT)
committerhyunuktak <hyunuk.tak@samsung.com>2015-12-23 06:03:27 (GMT)
commitdcd2baa12a64c02e214ef872854dbd631389950b (patch)
tree978e56dac8b866c5c19eb8cb75bb76648f5c6ef9
parentf338b3299e84ec6590da247efbd1336d89d27aeb (diff)
downloadconnman-dcd2baa12a64c02e214ef872854dbd631389950b.zip
connman-dcd2baa12a64c02e214ef872854dbd631389950b.tar.gz
connman-dcd2baa12a64c02e214ef872854dbd631389950b.tar.bz2
Apply tpkp-gnutls #2refs/changes/15/55315/1
Change-Id: I2cbd57173eea6720389d60324b4e6f374e66611d Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
-rwxr-xr-xgweb/giognutls.c14
-rwxr-xr-xpackaging/connman.spec2
2 files changed, 11 insertions, 5 deletions
diff --git a/gweb/giognutls.c b/gweb/giognutls.c
index a790eca..689bc52 100755
--- a/gweb/giognutls.c
+++ b/gweb/giognutls.c
@@ -461,16 +461,20 @@ GIOChannel *g_io_channel_gnutls_new(int fd)
gnutls_priority_set_direct(gnutls_channel->session,
"NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT", NULL);
#endif
+ gnutls_certificate_allocate_credentials(&gnutls_channel->cred);
+ 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
*/
- gnutls_certificate_set_x509_trust_file(gnutls_channel->cred, "/etc/ssl/ca-bundle.pem", GNUTLS_X509_FMT_PEM);
-
- gnutls_certificate_allocate_credentials(&gnutls_channel->cred);
- gnutls_credentials_set(gnutls_channel->session,
- GNUTLS_CRD_CERTIFICATE, gnutls_channel->cred);
+ 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);
diff --git a/packaging/connman.spec b/packaging/connman.spec
index 4dabaed..f3c2140 100755
--- a/packaging/connman.spec
+++ b/packaging/connman.spec
@@ -13,6 +13,7 @@ BuildRequires: pkgconfig(xtables)
BuildRequires: pkgconfig(gnutls)
BuildRequires: pkgconfig(libsmack)
BuildRequires: pkgconfig(tpkp-gnutls)
+BuildRequires: ca-certificates-devel
BuildRequires: readline-devel
#%systemd_requires
Requires: iptables
@@ -51,6 +52,7 @@ Header files and development files for connman.
%build
CFLAGS+=" -DTIZEN_EXT -lsmack -Werror"
+CFLAGS+=" -DTIZEN_SYS_CA_BUNDLE=\"%TZ_SYS_CA_BUNDLE\""
%if "%{profile}" == "tv"
CFLAGS+=" -DTIZEN_TV_EXT"
%endif