X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gweb%2Fgiognutls.c;h=b5c476cbe670afc3ca9d723dbf1ef88dd2c33569;hb=7e5e845e5fd4665b1a75985b198f727872937efb;hp=31cf902072ec5e874a15c8f3180876a6a309a3df;hpb=c98b80f557bad82b6f9f671fc7a8505e3137fb5e;p=platform%2Fupstream%2Fconnman.git diff --git a/gweb/giognutls.c b/gweb/giognutls.c index 31cf902..b5c476c 100755 --- a/gweb/giognutls.c +++ b/gweb/giognutls.c @@ -304,7 +304,7 @@ static gboolean g_io_gnutls_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) { GIOGnuTLSWatch *watch = (GIOGnuTLSWatch *) source; - GIOFunc func = (GIOFunc) callback; + GIOFunc func = (GIOFunc) (void (*) (void)) callback; GIOCondition condition = watch->pollfd.revents; DBG("source %p condition %u", source, condition); @@ -421,7 +421,7 @@ GIOChannel *g_io_channel_gnutls_new(int fd) DBG(""); - gnutls_channel = g_new(GIOGnuTLSChannel, 1); + gnutls_channel = g_new0(GIOGnuTLSChannel, 1); channel = (GIOChannel *) gnutls_channel; @@ -458,6 +458,7 @@ 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);