From: Terry Wilson Date: Fri, 5 Feb 2010 17:20:24 +0000 (+0000) Subject: Fix crash on 32-bit for users not using https X-Git-Tag: 11.0.0-beta1~3485 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ad36191895b81642268f6f201d5882f08a274ac;p=thirdparty%2Fasterisk.git Fix crash on 32-bit for users not using https (closes issue #16778) Reported by: pitel Patches: diff.txt uploaded by twilson (license 396) Tested by: twilson, pitel git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@244945 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index d23f9a65aa..c7c8f2f0bf 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -630,7 +630,7 @@ static void *caldav_load_calendar(void *void_data) pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port); ne_set_server_auth(pvt->session, auth_credentials, pvt); - if (!strncasecmp(pvt->uri.scheme, "https", sizeof(pvt->uri.scheme))) { + if (!strcasecmp(pvt->uri.scheme, "https")) { ne_ssl_trust_default_ca(pvt->session); ne_ssl_set_verify(pvt->session, verify_cert, NULL); } diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c index 4722e6e88f..8bead3a7ea 100644 --- a/res/res_calendar_exchange.c +++ b/res/res_calendar_exchange.c @@ -694,7 +694,7 @@ static void *exchangecal_load_calendar(void *void_data) pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port); ne_set_server_auth(pvt->session, auth_credentials, pvt); - if (!strncasecmp(pvt->uri.scheme, "https", sizeof(pvt->uri.scheme))) { + if (!strcasecmp(pvt->uri.scheme, "https")) { ne_ssl_trust_default_ca(pvt->session); } diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c index 08ef8f5194..44febe75b2 100644 --- a/res/res_calendar_icalendar.c +++ b/res/res_calendar_icalendar.c @@ -413,7 +413,7 @@ static void *ical_load_calendar(void *void_data) pvt->session = ne_session_create(pvt->uri.scheme, pvt->uri.host, pvt->uri.port); ne_set_server_auth(pvt->session, auth_credentials, pvt); - if (!strncasecmp(pvt->uri.scheme, "https", sizeof(pvt->uri.scheme))) { + if (!strcasecmp(pvt->uri.scheme, "https")) { ne_ssl_trust_default_ca(pvt->session); }