--- belle-sip-1.5.0/include/belle-sip/list.h.orig	2016-12-18 17:25:25.842547817 +0100
+++ belle-sip-1.5.0/include/belle-sip/list.h	2016-12-18 17:25:34.362598812 +0100
@@ -35,8 +35,8 @@
 #define belle_sip_list_size bctbx_list_size
 #define belle_sip_list_for_each bctbx_list_for_each
 #define belle_sip_list_for_each2 bctbx_list_for_each2
-#define belle_sip_list_remove_link bctbx_list_remove_link
-#define belle_sip_list_delete_link bctbx_list_delete_link
+#define belle_sip_list_remove_link bctbx_list_unlink
+#define belle_sip_list_delete_link bctbx_list_erase_link
 #define belle_sip_list_find bctbx_list_find
 #define belle_sip_list_free bctbx_list_free
 #define belle_sip_list_free_with_data bctbx_list_free_with_data
--- belle-sip-1.5.0/src/transports/tls_channel.c.orig	2016-12-18 17:31:41.067884327 +0100
+++ belle-sip-1.5.0/src/transports/tls_channel.c	2016-12-18 17:31:45.741914352 +0100
@@ -814,7 +814,7 @@
 	bctbx_ssl_config_set_rng(obj->sslcfg, random_generator, NULL);
 	bctbx_ssl_set_io_callbacks(obj->sslctx, obj, tls_callback_write, tls_callback_read);
 	if (crypto_config->root_ca && belle_sip_tls_channel_load_root_ca(obj,crypto_config->root_ca)==0){
-		bctbx_ssl_config_set_ca_chain(obj->sslcfg, obj->root_ca, super->base.peer_cname ? super->base.peer_cname : super->base.peer_name );
+		bctbx_ssl_config_set_ca_chain(obj->sslcfg, obj->root_ca);
 	}
 	bctbx_ssl_config_set_callback_verify(obj->sslcfg, belle_sip_ssl_verify, crypto_config);
 	bctbx_ssl_config_set_callback_cli_cert(obj->sslcfg, belle_sip_client_certificate_request_callback, obj);