char signedness for gcc 4 (id-wsf part has not been done)

21 files changed, 198 insertions, 183 deletions

diff --git a/lasso/id-ff/federation.c b/lasso/id-ff/federation.c
index c06d0296..499d74ff 100644
--- a/lasso/id-ff/federation.c
+++ b/lasso/id-ff/federation.c
@@ -147,7 +147,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNode *xmlnode;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xmlSetProp(xmlnode, "FederationDumpVersion", "2");
+	xmlSetProp(xmlnode, (xmlChar*)"FederationDumpVersion", (xmlChar*)"2");
 
 	return xmlnode;
 }
diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index 327ab81a..520a0589 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -126,9 +126,9 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNode *xmlnode;
 	LassoIdentity *identity = LASSO_IDENTITY(node);
 
-	xmlnode = xmlNewNode(NULL, "Identity");
-	xmlSetNs(xmlnode, xmlNewNs(xmlnode, LASSO_LASSO_HREF, NULL));
-	xmlSetProp(xmlnode, "Version", "2");
+	xmlnode = xmlNewNode(NULL, (xmlChar*)"Identity");
+	xmlSetNs(xmlnode, xmlNewNs(xmlnode, (xmlChar*)LASSO_LASSO_HREF, NULL));
+	xmlSetProp(xmlnode, (xmlChar*)"Version", (xmlChar*)"2");
 
 	if (g_hash_table_size(identity->federations))
 		g_hash_table_foreach(identity->federations,
@@ -150,7 +150,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 			continue;
 		}
 
-		if (strcmp(t->name, "Federation") == 0) {
+		if (strcmp((char*)t->name, "Federation") == 0) {
 			LassoFederation *federation;
 			federation = LASSO_FEDERATION(lasso_node_new_from_xmlNode(t));
 			g_hash_table_insert(
@@ -282,7 +282,7 @@ lasso_identity_new_from_dump(const gchar *dump)
 		return NULL;
 
 	rootElement = xmlDocGetRootElement(doc);
-	if (strcmp(rootElement->name, "Identity") != 0) {
+	if (strcmp((char*)rootElement->name, "Identity") != 0) {
 		xmlFreeDoc(doc);
 		return NULL;
 	}
diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c
index 3ae0e191..a73da7b6 100644
--- a/lasso/id-ff/lecp.c
+++ b/lasso/id-ff/lecp.c
@@ -85,7 +85,8 @@ lasso_lecp_build_authn_request_envelope_msg(LassoLecp *lecp)
 	xmlNodeDumpOutput(buf, NULL, msg, 0, 0, "utf-8");
 	xmlOutputBufferFlush(buf);
 
-	profile->msg_body = g_strdup(buf->conv ? buf->conv->content : buf->buffer->content);
+	profile->msg_body = g_strdup(
+			(char*)(buf->conv ? buf->conv->content : buf->buffer->content));
 	xmlOutputBufferClose(buf);
 	xmlFreeNode(msg);
 
@@ -295,9 +296,9 @@ lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, const char *reque
 
 	doc = xmlParseMemory(request_msg, strlen(request_msg));
 	xpathCtx = xmlXPathNewContext(doc);
-	xmlXPathRegisterNs(xpathCtx, "lib", LASSO_LIB_HREF);
+	xmlXPathRegisterNs(xpathCtx, (xmlChar*)"lib", (xmlChar*)LASSO_LIB_HREF);
 	/* TODO: will need to use another href for id-ff 1.1 support */
-	xpathObj = xmlXPathEvalExpression("//lib:AuthnRequest", xpathCtx);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)"//lib:AuthnRequest", xpathCtx);
 
 	if (xpathObj == NULL)
 		return critical_error(LASSO_PROFILE_ERROR_INVALID_MSG);
@@ -310,19 +311,19 @@ lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, const char *reque
 	authn_request = xmlCopyNode(xpathObj->nodesetval->nodeTab[0], 1);
 	xmlFreeDoc(doc);
 
-	soap_envelope = xmlNewNode(NULL, "Envelope");
-	xmlSetNs(soap_envelope,
-			xmlNewNs(soap_envelope, LASSO_SOAP_ENV_HREF, LASSO_SOAP_ENV_PREFIX));
+	soap_envelope = xmlNewNode(NULL, (xmlChar*)"Envelope");
+	xmlSetNs(soap_envelope, xmlNewNs(soap_envelope,
+				(xmlChar*)LASSO_SOAP_ENV_HREF, (xmlChar*)LASSO_SOAP_ENV_PREFIX));
 
-	soap_body = xmlNewTextChild(soap_envelope, NULL, "Body", NULL);
+	soap_body = xmlNewTextChild(soap_envelope, NULL, (xmlChar*)"Body", NULL);
 	xmlAddChild(soap_body, authn_request);
 
 	handler = xmlFindCharEncodingHandler("utf-8");
 	buf = xmlAllocOutputBuffer(handler);
 	xmlNodeDumpOutput(buf, NULL, soap_envelope, 0, 0, "utf-8");
 	xmlOutputBufferFlush(buf);
-	LASSO_PROFILE(lecp)->msg_body = g_strdup(
-			buf->conv ? buf->conv->content : buf->buffer->content);
+	LASSO_PROFILE(lecp)->msg_body = g_strdup( (char*)(
+			buf->conv ? buf->conv->content : buf->buffer->content));
 	xmlOutputBufferClose(buf);
 	xmlFreeNode(soap_envelope);
 
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c
index 1323fa06..25b3ab77 100644
--- a/lasso/id-ff/login.c
+++ b/lasso/id-ff/login.c
@@ -321,7 +321,7 @@ lasso_login_build_assertion(LassoLogin *login,
 static gboolean
 lasso_login_must_ask_for_consent_private(LassoLogin *login)
 {
-	xmlChar *nameIDPolicy, *consent;
+	char *nameIDPolicy, *consent;
 	LassoProfile *profile = LASSO_PROFILE(login);
 	LassoFederation *federation = NULL;
 
@@ -611,7 +611,7 @@ static void
 lasso_login_build_assertion_artifact(LassoLogin *login)
 {
 	xmlSecByte samlArt[42], *b64_samlArt;
-	xmlChar *identityProviderSuccinctID;
+	char *identityProviderSuccinctID;
 
 	identityProviderSuccinctID = lasso_sha1(
 			LASSO_PROVIDER(LASSO_PROFILE(login)->server)->ProviderID);
@@ -619,12 +619,12 @@ lasso_login_build_assertion_artifact(LassoLogin *login)
 	/* Artifact Format is described in "Binding Profiles", 3.2.2.2. */
 	memcpy(samlArt, "\000\003", 2); /* type code */
 	memcpy(samlArt+2, identityProviderSuccinctID, 20);
-	lasso_build_random_sequence(samlArt+22, 20);
+	lasso_build_random_sequence((char*)samlArt+22, 20);
 
 	xmlFree(identityProviderSuccinctID);
 	b64_samlArt = xmlSecBase64Encode(samlArt, 42, 0);
 
-	login->assertionArtifact = g_strdup(b64_samlArt);
+	login->assertionArtifact = g_strdup((char*)b64_samlArt);
 	xmlFree(b64_samlArt);
 }
 
@@ -645,7 +645,8 @@ lasso_login_build_artifact_msg(LassoLogin *login, LassoHttpMethod http_method)
 	LassoProvider *remote_provider;
 	LassoProfile *profile;
 	gchar *url;
-	xmlSecByte *b64_samlArt, *relayState;
+	xmlChar *b64_samlArt;
+	char *relayState;
 	gint ret = 0;
 
 	g_return_val_if_fail(LASSO_IS_LOGIN(login), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
@@ -708,8 +709,9 @@ lasso_login_build_artifact_msg(LassoLogin *login, LassoHttpMethod http_method)
 		}
 	}
 
-	b64_samlArt = xmlStrdup(login->assertionArtifact);
-	relayState = xmlURIEscapeStr(LASSO_LIB_AUTHN_REQUEST(profile->request)->RelayState, NULL);
+	b64_samlArt = xmlStrdup((xmlChar*)login->assertionArtifact);
+	relayState = (char*)xmlURIEscapeStr(
+			(xmlChar*)LASSO_LIB_AUTHN_REQUEST(profile->request)->RelayState, NULL);
 
 	if (http_method == LASSO_HTTP_METHOD_REDIRECT) {
 		xmlChar *escaped_artifact = xmlURIEscapeStr(b64_samlArt, NULL);
@@ -725,7 +727,7 @@ lasso_login_build_artifact_msg(LassoLogin *login, LassoHttpMethod http_method)
 
 	if (http_method == LASSO_HTTP_METHOD_POST) {
 		profile->msg_url = g_strdup(url);
-		profile->msg_body = g_strdup(b64_samlArt);
+		profile->msg_body = g_strdup((char*)b64_samlArt);
 		if (relayState != NULL) {
 			profile->msg_relayState = g_strdup(relayState);
 		}
@@ -1168,7 +1170,7 @@ lasso_login_init_request(LassoLogin *login, gchar *response_msg,
 		artifact_b64 = g_strdup(response_msg);
 	}
 
-	i = xmlSecBase64Decode(artifact_b64, artifact, 43);
+	i = xmlSecBase64Decode((xmlChar*)artifact_b64, (xmlChar*)artifact, 43);
 	if (i < 0 || i > 42) {
 		g_free(artifact_b64);
 		return LASSO_ERROR_UNDEFINED;
@@ -1182,7 +1184,7 @@ lasso_login_init_request(LassoLogin *login, gchar *response_msg,
 	memcpy(provider_succinct_id, artifact+2, 20);
 	provider_succinct_id[20] = 0;
 
-	provider_succinct_id_b64 = xmlSecBase64Encode(provider_succinct_id, 20, 0);
+	provider_succinct_id_b64 = (char*)xmlSecBase64Encode((xmlChar*)provider_succinct_id, 20, 0);
 
 	LASSO_PROFILE(login)->remote_providerID = lasso_server_get_providerID_from_hash(
 			LASSO_PROFILE(login)->server, provider_succinct_id_b64);
@@ -1611,12 +1613,12 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	LassoLogin *login = LASSO_LOGIN(node);
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xmlSetProp(xmlnode, "LoginDumpVersion", "2");
+	xmlSetProp(xmlnode, (xmlChar*)"LoginDumpVersion", (xmlChar*)"2");
 
 	if (login->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART)
-		xmlNewTextChild(xmlnode, NULL, "ProtocolProfile", "Artifact");
+		xmlNewTextChild(xmlnode, NULL, (xmlChar*)"ProtocolProfile", (xmlChar*)"Artifact");
 	if (login->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_POST)
-		xmlNewTextChild(xmlnode, NULL, "ProtocolProfile", "POST");
+		xmlNewTextChild(xmlnode, NULL, (xmlChar*)"ProtocolProfile", (xmlChar*)"POST");
 
 	return xmlnode;
 }
@@ -1637,9 +1639,9 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 			t = t->next;
 			continue;
 		}
-		if (strcmp(t->name, "ProtocolProfile") == 0) {
+		if (strcmp((char*)t->name, "ProtocolProfile") == 0) {
 			char *s;
-			s = xmlNodeGetContent(t);
+			s = (char*)xmlNodeGetContent(t);
 			if (strcmp(s, "Artifact") == 0)
 				login->protocolProfile = LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART;
 			if (strcmp(s, "POST") == 0)
diff --git a/lasso/id-ff/logout.c b/lasso/id-ff/logout.c
index 5fc8c05c..0ef4532e 100644
--- a/lasso/id-ff/logout.c
+++ b/lasso/id-ff/logout.c
@@ -868,8 +868,8 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNode *xmlnode;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xmlNodeSetName(xmlnode, "Logout");
-	xmlSetProp(xmlnode, "LogoutDumpVersion", "2");
+	xmlNodeSetName(xmlnode, (xmlChar*)"Logout");
+	xmlSetProp(xmlnode, (xmlChar*)"LogoutDumpVersion", (xmlChar*)"2");
 
 	return xmlnode;
 }
diff --git a/lasso/id-ff/name_registration.c b/lasso/id-ff/name_registration.c
index 50350165..43b34c49 100644
--- a/lasso/id-ff/name_registration.c
+++ b/lasso/id-ff/name_registration.c
@@ -623,7 +623,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNode *xmlnode;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xmlSetProp(xmlnode, "NameRegistrationDumpVersion", "2");
+	xmlSetProp(xmlnode, (xmlChar*)"NameRegistrationDumpVersion", (xmlChar*)"2");
 
 	return xmlnode;
 }
diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index 9204a5a4..880fefe6 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -105,11 +105,11 @@ lasso_profile_get_request_type_from_soap_msg(const gchar *soap)
 
 	doc = xmlParseMemory(soap, strlen(soap));
 	xpathCtx = xmlXPathNewContext(doc);
-	xmlXPathRegisterNs(xpathCtx, "s", LASSO_SOAP_ENV_HREF);
-	xpathObj = xmlXPathEvalExpression("//s:Body/*", xpathCtx);
+	xmlXPathRegisterNs(xpathCtx, (xmlChar*)"s", (xmlChar*)LASSO_SOAP_ENV_HREF);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)"//s:Body/*", xpathCtx);
 
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr) {
-		name = xpathObj->nodesetval->nodeTab[0]->name;
+		name = (char*)xpathObj->nodesetval->nodeTab[0]->name;
 		ns = xpathObj->nodesetval->nodeTab[0]->ns;
 	}
 
@@ -128,13 +128,13 @@ lasso_profile_get_request_type_from_soap_msg(const gchar *soap)
 	} else if (strcmp(name, "AuthnRequest") == 0) {
 		type = LASSO_REQUEST_TYPE_LECP;
 	} else if (strcmp(name, "Query") == 0) {
-		if (strcmp(ns->href, LASSO_DISCO_HREF) == 0) {
+		if (strcmp((char*)ns->href, LASSO_DISCO_HREF) == 0) {
 			type = LASSO_REQUEST_TYPE_DISCO_QUERY;
 		} else {
 			type = LASSO_REQUEST_TYPE_DST_QUERY;
 		}
 	} else if (strcmp(name, "Modify") == 0) {
-		if (strcmp(ns->href, LASSO_DISCO_HREF) == 0) {
+		if (strcmp((char*)ns->href, LASSO_DISCO_HREF) == 0) {
 			type =LASSO_REQUEST_TYPE_DISCO_MODIFY;
 		} else {
 			type =LASSO_REQUEST_TYPE_DST_MODIFY;	
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c
index 96f88304..b5b36b02 100644
--- a/lasso/id-ff/provider.c
+++ b/lasso/id-ff/provider.c
@@ -301,7 +301,7 @@ lasso_provider_get_base64_succinct_id(LassoProvider *provider)
 	char *succinct_id, *base64_succinct_id;
 
 	succinct_id = lasso_sha1(provider->ProviderID);
-	base64_succinct_id = xmlSecBase64Encode(succinct_id, 20, 0);
+	base64_succinct_id = (char*)xmlSecBase64Encode((xmlChar*)succinct_id, 20, 0);
 	xmlFree(succinct_id);
 	return base64_succinct_id;
 }
@@ -355,17 +355,17 @@ load_descriptor(xmlNode *xmlnode, GHashTable *descriptor, LassoProvider *provide
 			t = t->next;
 			continue;
 		}
-		if (strcmp(t->name, "KeyDescriptor") == 0) {
-			char *use = xmlGetProp(t, "use");
+		if (strcmp((char*)t->name, "KeyDescriptor") == 0) {
+			char *use = (char*)xmlGetProp(t, (xmlChar*)"use");
 			if (use && strcmp(use, "signing") == 0) {
 				provider->private_data->signing_key_descriptor = xmlCopyNode(t, 1);
 			}
 			t = t->next;
 			continue;
 		}
-		if (strcmp(t->name, "AssertionConsumerServiceURL") == 0) {
-			char *isDefault = xmlGetProp(t, "isDefault");
-			char *id = xmlGetProp(t, "id");
+		if (strcmp((char*)t->name, "AssertionConsumerServiceURL") == 0) {
+			char *isDefault = (char*)xmlGetProp(t, (xmlChar*)"isDefault");
+			char *id = (char*)xmlGetProp(t, (xmlChar*)"id");
 			name = g_strdup_printf("%s %s", t->name, id);
 			if (isDefault) {
 				if (strcmp(isDefault, "true") == 0 || strcmp(isDefault, "1") == 0)
@@ -375,11 +375,11 @@ load_descriptor(xmlNode *xmlnode, GHashTable *descriptor, LassoProvider *provide
 			}
 			xmlFree(id);
 		} else {
-			name = g_strdup(t->name);
+			name = g_strdup((char*)t->name);
 		}
 		elements = g_hash_table_lookup(descriptor, name);
 		value = xmlNodeGetContent(t);
-		elements = g_list_append(elements, g_strdup(value));
+		elements = g_list_append(elements, g_strdup((char*)value));
 		xmlFree(value);
 		g_hash_table_insert(descriptor, name, elements);
 		t = t->next;
@@ -394,9 +394,9 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	char *roles[] = { "None", "SP", "IdP"};
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xmlSetProp(xmlnode, "ProviderDumpVersion", "2");
+	xmlSetProp(xmlnode, (xmlChar*)"ProviderDumpVersion", (xmlChar*)"2");
 	if (provider->role)
-		xmlSetProp(xmlnode, "ProviderRole", roles[provider->role]);
+		xmlSetProp(xmlnode, (xmlChar*)"ProviderRole", (xmlChar*)roles[provider->role]);
 
 	return xmlnode;
 }
@@ -413,10 +413,10 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 	if (xmlnode == NULL)
 		return LASSO_ERROR_UNDEFINED;
 
-	s = xmlGetProp(xmlnode, "ProviderRole");
-	if (s && strcmp(s, "SP") == 0)
+	s = xmlGetProp(xmlnode, (xmlChar*)"ProviderRole");
+	if (s && strcmp((char*)s, "SP") == 0)
 		provider->role = LASSO_PROVIDER_ROLE_SP;
-	if (s && strcmp(s, "IdP") == 0)
+	if (s && strcmp((char*)s, "IdP") == 0)
 		provider->role = LASSO_PROVIDER_ROLE_IDP;
 	if (s)
 		xmlFree(s);
@@ -599,15 +599,15 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	provider->private_data->conformance = LIBERTY_1_2;
 
 	xpathCtx = xmlXPathNewContext(doc);
-	xmlXPathRegisterNs(xpathCtx, "md", LASSO_METADATA_HREF);
-	xpathObj = xmlXPathEvalExpression("/md:EntityDescriptor", xpathCtx);
+	xmlXPathRegisterNs(xpathCtx, (xmlChar*)"md", (xmlChar*)LASSO_METADATA_HREF);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)"/md:EntityDescriptor", xpathCtx);
 	/* if empty: not a ID-FF 1.2 metadata file -> bails out */
 	if (xpathObj->nodesetval == NULL || xpathObj->nodesetval->nodeNr == 0) {
 		xmlXPathFreeObject(xpathObj);
-		xmlXPathRegisterNs(xpathCtx, "md11",
-				"http://projectliberty.org/schemas/core/2002/12");
+		xmlXPathRegisterNs(xpathCtx, (xmlChar*)"md11",
+				(xmlChar*)"http://projectliberty.org/schemas/core/2002/12");
 		xpathObj = xmlXPathEvalExpression(
-				"/md11:SPDescriptor|/md11:IDPDescriptor", xpathCtx);
+				(xmlChar*)"/md11:SPDescriptor|/md11:IDPDescriptor", xpathCtx);
 		if (xpathObj->nodesetval == NULL || xpathObj->nodesetval->nodeNr == 0) {
 			xmlXPathFreeObject(xpathObj);
 			xmlFreeDoc(doc);
@@ -619,9 +619,9 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 		xpath_sp = "/md11:SPDescriptor";
 	}
 	node = xpathObj->nodesetval->nodeTab[0];
-	provider->ProviderID = xmlGetProp(node, "providerID");
+	provider->ProviderID = (char*)xmlGetProp(node, (xmlChar*)"providerID");
 
-	xpathObj = xmlXPathEvalExpression(xpath_idp, xpathCtx);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)xpath_idp, xpathCtx);
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr == 1) {
 		load_descriptor(xpathObj->nodesetval->nodeTab[0],
 				provider->private_data->IDPDescriptor, provider);
@@ -629,8 +629,8 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 			/* lookup ProviderID */
 			node = xpathObj->nodesetval->nodeTab[0]->children;
 			while (node) {
-				if (strcmp(node->name, "ProviderID") == 0) {
-					provider->ProviderID = xmlNodeGetContent(node);
+				if (strcmp((char*)node->name, "ProviderID") == 0) {
+					provider->ProviderID = (char*)xmlNodeGetContent(node);
 					break;
 				}
 				node = node->next;
@@ -639,7 +639,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	}
 	xmlXPathFreeObject(xpathObj);
 
-	xpathObj = xmlXPathEvalExpression(xpath_sp, xpathCtx);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)xpath_sp, xpathCtx);
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr == 1) {
 		load_descriptor(xpathObj->nodesetval->nodeTab[0],
 				provider->private_data->SPDescriptor, provider);
@@ -647,8 +647,8 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 			/* lookup ProviderID */
 			node = xpathObj->nodesetval->nodeTab[0]->children;
 			while (node) {
-				if (strcmp(node->name, "ProviderID") == 0) {
-					provider->ProviderID = xmlNodeGetContent(node);
+				if (strcmp((char*)node->name, "ProviderID") == 0) {
+					provider->ProviderID = (char*)xmlNodeGetContent(node);
 					break;
 				}
 				node = node->next;
@@ -657,7 +657,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *metadata)
 	}
 	xmlXPathFreeObject(xpathObj);
 
-	xpathObj = xmlXPathEvalExpression(xpath_organization, xpathCtx);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)xpath_organization, xpathCtx);
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr == 1) {
 		provider->private_data->organization = xmlCopyNode(
 				xpathObj->nodesetval->nodeTab[0], 1);
@@ -722,12 +722,12 @@ lasso_provider_load_public_key(LassoProvider *provider)
 		/* could use XPath but going down manually will do */
 		while (t) {
 			if (t->type == XML_ELEMENT_NODE) {
-				if (strcmp(t->name, "KeyInfo") == 0 ||
-						strcmp(t->name, "X509Data") == 0) {
+				if (strcmp((char*)t->name, "KeyInfo") == 0 ||
+						strcmp((char*)t->name, "X509Data") == 0) {
 					t = t->children;
 					continue;
 				}
-				if (strcmp(t->name, "X509Certificate") == 0)
+				if (strcmp((char*)t->name, "X509Certificate") == 0)
 					break;
 			}
 			t = t->next;
@@ -736,7 +736,7 @@ lasso_provider_load_public_key(LassoProvider *provider)
 			return;
 
 		b64_value = xmlNodeGetContent(t);
-		length = strlen(b64_value);
+		length = strlen((char*)b64_value);
 		value = g_malloc(length);
 		rc = xmlSecBase64Decode(b64_value, value, length);
 		if (rc < 0) {
@@ -826,7 +826,7 @@ int lasso_provider_verify_signature(LassoProvider *provider,
 
 	if (format == LASSO_MESSAGE_FORMAT_BASE64) {
 		msg = g_malloc(strlen(message));
-		rc = xmlSecBase64Decode(message, msg, strlen(message));
+		rc = xmlSecBase64Decode((xmlChar*)message, (xmlChar*)msg, strlen(message));
 		if (rc < 0) {
 			g_free(msg);
 			return -3;
@@ -844,8 +844,8 @@ int lasso_provider_verify_signature(LassoProvider *provider,
 		xmlXPathObject *xpathObj;
 
 		xpathCtx = xmlXPathNewContext(doc);
-		xmlXPathRegisterNs(xpathCtx, "s", LASSO_SOAP_ENV_HREF);
-		xpathObj = xmlXPathEvalExpression("//s:Body/*", xpathCtx);
+		xmlXPathRegisterNs(xpathCtx, (xmlChar*)"s", (xmlChar*)LASSO_SOAP_ENV_HREF);
+		xpathObj = xmlXPathEvalExpression((xmlChar*)"//s:Body/*", xpathCtx);
 		if (xpathObj->nodesetval && xpathObj->nodesetval->nodeNr ) {
 			xmlnode = xpathObj->nodesetval->nodeTab[0];
 		}
@@ -860,8 +860,8 @@ int lasso_provider_verify_signature(LassoProvider *provider,
 	}
 
 	if (id_attr_name) {
-		char *id_value = xmlGetProp(xmlnode, id_attr_name);
-		xmlAttr *id_attr = xmlHasProp(xmlnode, id_attr_name);
+		xmlChar *id_value = xmlGetProp(xmlnode, (xmlChar*)id_attr_name);
+		xmlAttr *id_attr = xmlHasProp(xmlnode, (xmlChar*)id_attr_name);
 		if (id_value) {
 			xmlAddID(NULL, doc, id_value, id_attr);
 			xmlFree(id_value);
@@ -870,7 +870,7 @@ int lasso_provider_verify_signature(LassoProvider *provider,
 
 	sign = NULL;
 	for (sign = xmlnode->children; sign; sign = sign->next) {
-		if (strcmp(sign->name, "Signature") == 0)
+		if (strcmp((char*)sign->name, "Signature") == 0)
 			break;
 	}
 
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 4f2bc366..6e3e8ec9 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -143,13 +143,14 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNode *xmlnode;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	xmlSetProp(xmlnode, "ServerDumpVersion", "2");
-	xmlSetProp(xmlnode, "SignatureMethod", signature_methods[server->signature_method]);
+	xmlSetProp(xmlnode, (xmlChar*)"ServerDumpVersion", (xmlChar*)"2");
+	xmlSetProp(xmlnode, (xmlChar*)"SignatureMethod",
+			(xmlChar*)signature_methods[server->signature_method]);
 
 	/* Providers */
 	if (g_hash_table_size(server->providers)) {
 		xmlNode *t;
-		t = xmlNewTextChild(xmlnode, NULL, "Providers", NULL);
+		t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"Providers", NULL);
 		g_hash_table_foreach(server->providers,
 				(GHFunc)add_provider_childnode, t);
 	}
@@ -157,7 +158,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	/* Services */
 	if (g_hash_table_size(server->services)) {
 		xmlNode *t;
-		t = xmlNewTextChild(xmlnode, NULL, "Services", NULL);
+		t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"Services", NULL);
 		g_hash_table_foreach(server->services,
 				(GHFunc)add_service_childnode, t);
 	}
@@ -180,10 +181,10 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 	if (rc)
 		return rc;
 
-	s = xmlGetProp(xmlnode, "SignatureMethod");
-	if (s && strcmp(s, "RSA_SHA1") == 0)
+	s = xmlGetProp(xmlnode, (xmlChar*)"SignatureMethod");
+	if (s && strcmp((char*)s, "RSA_SHA1") == 0)
 		server->signature_method = LASSO_SIGNATURE_METHOD_RSA_SHA1;
-	if (s && strcmp(s, "DSA_SHA1") == 0)
+	if (s && strcmp((char*)s, "DSA_SHA1") == 0)
 		server->signature_method = LASSO_SIGNATURE_METHOD_DSA_SHA1;
 	if (s)
 		xmlFree(s);
@@ -197,7 +198,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 			continue;
 		}
 
-		if (strcmp(t->name, "Providers") == 0) {
+		if (strcmp((char*)t->name, "Providers") == 0) {
 			while (t2) {
 				LassoProvider *p;
 				if (t2->type != XML_ELEMENT_NODE) {
@@ -213,7 +214,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 		}
 		
 #ifdef LASSO_WSF_ENABLED
-		if (strcmp(t->name, "Services") == 0) {
+		if (strcmp((char*)t->name, "Services") == 0) {
 			while (t2) {
 				LassoDiscoServiceInstance *s;
 				if (t2->type != XML_ELEMENT_NODE) {
@@ -300,10 +301,11 @@ static gboolean
 get_providerID_with_hash(gchar *key, gpointer value, char **providerID)
 {
 	char *hash = *providerID;
-	char *hash_providerID, *b64_hash_providerID;
+	xmlChar *hash_providerID;
+	char *b64_hash_providerID;
 
-	hash_providerID = lasso_sha1(key);
-	b64_hash_providerID = xmlSecBase64Encode(hash_providerID, 20, 0);
+	hash_providerID = (xmlChar*)lasso_sha1(key);
+	b64_hash_providerID = (char*)xmlSecBase64Encode(hash_providerID, 20, 0);
 	xmlFree(hash_providerID);
 
 	if (strcmp(b64_hash_providerID, hash) == 0) {
diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c
index c71d6ba5..d3712280 100644
--- a/lasso/id-ff/session.c
+++ b/lasso/id-ff/session.c
@@ -250,8 +250,8 @@ static void
 add_assertion_childnode(gchar *key, LassoLibAssertion *value, xmlNode *xmlnode)
 {
 	xmlNode *t;
-	t = xmlNewTextChild(xmlnode, NULL, "Assertion", NULL);
-	xmlSetProp(t, "RemoteProviderID", key);
+	t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"Assertion", NULL);
+	xmlSetProp(t, (xmlChar*)"RemoteProviderID", (xmlChar*)key);
 	xmlAddChild(t, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE));
 }
 
@@ -259,8 +259,8 @@ static void
 add_status_childnode(gchar *key, LassoSamlpStatus *value, xmlNode *xmlnode)
 {
 	xmlNode *t;
-	t = xmlNewTextChild(xmlnode, NULL, "Status", NULL);
-	xmlSetProp(t, "RemoteProviderID", key);
+	t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)"Status", NULL);
+	xmlSetProp(t, (xmlChar*)"RemoteProviderID", (xmlChar*)key);
 	xmlAddChild(t, lasso_node_get_xmlNode(LASSO_NODE(value), TRUE));
 }
 
@@ -270,9 +270,9 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNode *xmlnode;
 	LassoSession *session = LASSO_SESSION(node);
 
-	xmlnode = xmlNewNode(NULL, "Session");
-	xmlSetNs(xmlnode, xmlNewNs(xmlnode, LASSO_LASSO_HREF, NULL));
-	xmlSetProp(xmlnode, "Version", "2");
+	xmlnode = xmlNewNode(NULL, (xmlChar*)"Session");
+	xmlSetNs(xmlnode, xmlNewNs(xmlnode, (xmlChar*)LASSO_LASSO_HREF, NULL));
+	xmlSetProp(xmlnode, (xmlChar*)"Version", (xmlChar*)"2");
 
 	if (g_hash_table_size(session->assertions))
 		g_hash_table_foreach(session->assertions,
@@ -297,7 +297,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 			continue;
 		}
 
-		if (strcmp(t->name, "Assertion") == 0) {
+		if (strcmp((char*)t->name, "Assertion") == 0) {
 			n = t->children;
 			while (n && n->type != XML_ELEMENT_NODE) n = n->next;
 			
@@ -305,10 +305,11 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 				LassoLibAssertion *assertion;
 				assertion = LASSO_LIB_ASSERTION(lasso_node_new_from_xmlNode(n));
 				g_hash_table_insert(session->assertions,
-						xmlGetProp(t, "RemoteProviderID"), assertion);
+						xmlGetProp(t, (xmlChar*)"RemoteProviderID"),
+						assertion);
 			}
 		}
-		if (strcmp(t->name, "Status") == 0) {
+		if (strcmp((char*)t->name, "Status") == 0) {
 			n = t->children;
 			while (n && n->type != XML_ELEMENT_NODE) n = n->next;
 			
@@ -316,7 +317,8 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 				LassoSamlpStatus *status;
 				status = LASSO_SAMLP_STATUS(lasso_node_new_from_xmlNode(n));
 				g_hash_table_insert(session->private_data->status,
-						xmlGetProp(t, "RemoteProviderID"), status);
+						xmlGetProp(t, (xmlChar*)"RemoteProviderID"),
+						status);
 			}
 		}
 		t = t->next;
@@ -455,7 +457,7 @@ lasso_session_new_from_dump(const gchar *dump)
 		return NULL;
 
 	rootElement = xmlDocGetRootElement(doc);
-	if (strcmp(rootElement->name, "Session") != 0) {
+	if (strcmp((char*)rootElement->name, "Session") != 0) {
 		xmlFreeDoc(doc);
 		return NULL;
 	}
diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c
index 4f3a623f..f57212bf 100644
--- a/lasso/xml/disco_modify_response.c
+++ b/lasso/xml/disco_modify_response.c
@@ -86,7 +86,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(xmlnode, LASSO_DISCO_HREF, LASSO_DISCO_PREFIX);
+	ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_DISCO_HREF, (xmlChar*)LASSO_DISCO_PREFIX);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/disco_query_response.c b/lasso/xml/disco_query_response.c
index dc52fb78..9707d05d 100644
--- a/lasso/xml/disco_query_response.c
+++ b/lasso/xml/disco_query_response.c
@@ -82,7 +82,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(NULL, LASSO_DISCO_HREF, LASSO_DISCO_PREFIX);
+	ns = xmlNewNs(NULL, (xmlChar*)LASSO_DISCO_HREF, (xmlChar*)LASSO_DISCO_PREFIX);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/dst_modify.c b/lasso/xml/dst_modify.c
index 15eaa8af..62018328 100644
--- a/lasso/xml/dst_modify.c
+++ b/lasso/xml/dst_modify.c
@@ -93,8 +93,8 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(xmlnode, LASSO_DST_MODIFY(node)->hrefServiceType,
-			LASSO_DST_MODIFY(node)->prefixServiceType);
+	ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_DST_MODIFY(node)->hrefServiceType,
+			(xmlChar*)LASSO_DST_MODIFY(node)->prefixServiceType);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/dst_modify_response.c b/lasso/xml/dst_modify_response.c
index 3fec23d8..644f5834 100644
--- a/lasso/xml/dst_modify_response.c
+++ b/lasso/xml/dst_modify_response.c
@@ -74,8 +74,8 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(xmlnode, LASSO_DST_MODIFY_RESPONSE(node)->hrefServiceType,
-			LASSO_DST_MODIFY_RESPONSE(node)->prefixServiceType);
+	ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_DST_MODIFY_RESPONSE(node)->hrefServiceType,
+			(xmlChar*)LASSO_DST_MODIFY_RESPONSE(node)->prefixServiceType);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/dst_query.c b/lasso/xml/dst_query.c
index f2caf9ce..80f51687 100644
--- a/lasso/xml/dst_query.c
+++ b/lasso/xml/dst_query.c
@@ -84,8 +84,8 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(xmlnode, LASSO_DST_QUERY(node)->hrefServiceType,
-			LASSO_DST_QUERY(node)->prefixServiceType);
+	ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_DST_QUERY(node)->hrefServiceType,
+			(xmlChar*)LASSO_DST_QUERY(node)->prefixServiceType);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/dst_query_response.c b/lasso/xml/dst_query_response.c
index e335297d..d26ecc5f 100644
--- a/lasso/xml/dst_query_response.c
+++ b/lasso/xml/dst_query_response.c
@@ -88,8 +88,8 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(xmlnode, LASSO_DST_QUERY_RESPONSE(node)->hrefServiceType,
-			LASSO_DST_QUERY_RESPONSE(node)->prefixServiceType);
+	ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_DST_QUERY_RESPONSE(node)->hrefServiceType,
+			(xmlChar*)LASSO_DST_QUERY_RESPONSE(node)->prefixServiceType);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/lib_federation_termination_notification.c b/lasso/xml/lib_federation_termination_notification.c
index 3806ec99..441ef9b2 100644
--- a/lasso/xml/lib_federation_termination_notification.c
+++ b/lasso/xml/lib_federation_termination_notification.c
@@ -96,8 +96,8 @@ build_query(LassoNode *node)
 	query = lasso_node_build_query_from_snippets(node);
 
 	if (request->RelayState) {
-		t = xmlURIEscapeStr(request->RelayState, NULL);
-		s = g_strdup_printf(t, "%s&RelayState=%s", query, request->RelayState);
+		t = xmlURIEscapeStr((xmlChar*)request->RelayState, NULL);
+		s = g_strdup_printf((char*)t, "%s&RelayState=%s", query, request->RelayState);
 		xmlFree(t);
 		g_free(query);
 		query = s;
diff --git a/lasso/xml/sa_sasl_response.c b/lasso/xml/sa_sasl_response.c
index 30c88795..11c54f13 100644
--- a/lasso/xml/sa_sasl_response.c
+++ b/lasso/xml/sa_sasl_response.c
@@ -97,7 +97,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	xmlNs *ns;
 
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlNewNs(xmlnode, LASSO_SA_HREF, LASSO_SA_PREFIX);
+	ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_SA_HREF, (xmlChar*)LASSO_SA_PREFIX);
 	insure_namespace(xmlnode, ns);
 
 	return xmlnode;
diff --git a/lasso/xml/saml_assertion.c b/lasso/xml/saml_assertion.c
index deceb36b..e7351eef 100644
--- a/lasso/xml/saml_assertion.c
+++ b/lasso/xml/saml_assertion.c
@@ -110,7 +110,7 @@ insure_namespace(xmlNode *xmlnode, xmlNs *ns)
 			continue;
 		}
 		
-		if (xmlnode->ns && strcmp(xmlnode->ns->href, LASSO_LIB_HREF) == 0) {
+		if (xmlnode->ns && strcmp((char*)xmlnode->ns->href, LASSO_LIB_HREF) == 0) {
 			char *typename, *gtypename;
 			GType gtype;
 
@@ -120,10 +120,12 @@ insure_namespace(xmlNode *xmlnode, xmlNs *ns)
 
 			if (gtype) {
 				xmlSetNs(xmlnode, ns);
-				if (xmlHasNsProp(t, "type", LASSO_XSI_HREF) == NULL) {
-					xsi_ns = xmlNewNs(xmlnode,
-							LASSO_XSI_HREF, LASSO_XSI_PREFIX);
-					xmlNewNsProp(xmlnode, xsi_ns, "type", typename);
+				if (xmlHasNsProp(t, (xmlChar*)"type",
+							(xmlChar*)LASSO_XSI_HREF) == NULL) {
+					xsi_ns = xmlNewNs(xmlnode, (xmlChar*)LASSO_XSI_HREF,
+							(xmlChar*)LASSO_XSI_PREFIX);
+					xmlNewNsProp(xmlnode, xsi_ns, (xmlChar*)"type",
+							(xmlChar*)typename);
 				}
 			}
 			g_free(gtypename);
@@ -146,7 +148,7 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	int rc;
 	
 	xmlnode = parent_class->get_xmlNode(node, lasso_dump);
-	ns = xmlSearchNs(NULL, xmlnode, "saml");
+	ns = xmlSearchNs(NULL, xmlnode, (xmlChar*)"saml");
 	insure_namespace(xmlnode, ns);
 
 	if (lasso_dump == FALSE && assertion->sign_type) {
diff --git a/lasso/xml/samlp_response.c b/lasso/xml/samlp_response.c
index 176d4623..71f21088 100644
--- a/lasso/xml/samlp_response.c
+++ b/lasso/xml/samlp_response.c
@@ -74,19 +74,21 @@ get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	if (LASSO_SAMLP_RESPONSE(node)->Status &&
 			has_lib_status(LASSO_SAMLP_RESPONSE(node)->Status->StatusCode)) {
 		/* liberty QName, add liberty namespace */
-		xmlNewNs(xmlnode, LASSO_LIB_HREF, LASSO_LIB_PREFIX);
+		xmlNewNs(xmlnode, (xmlChar*)LASSO_LIB_HREF, (xmlChar*)LASSO_LIB_PREFIX);
 	}
 
 
-	for (t = xmlnode->children; t && strcmp(t->name, "Assertion"); t = t->next) ;
+	for (t = xmlnode->children; t && strcmp((char*)t->name, "Assertion"); t = t->next) ;
 
-	if (t && strcmp(t->ns->href, LASSO_LIB_HREF) == 0) {
+	if (t && strcmp((char*)t->ns->href, LASSO_LIB_HREF) == 0) {
 		/* liberty nodes are not allowed in samlp nodes */
-		xmlSetNs(t, xmlNewNs(xmlnode, LASSO_SAML_ASSERTION_HREF,
-					LASSO_SAML_ASSERTION_PREFIX));
-		if (xmlHasNsProp(t, "type", LASSO_XSI_HREF) == NULL)
-			xmlNewNsProp(t, xmlNewNs(xmlnode, LASSO_XSI_HREF, LASSO_XSI_PREFIX),
-					"type", "lib:AssertionType");
+		xmlSetNs(t, xmlNewNs(xmlnode, (xmlChar*)LASSO_SAML_ASSERTION_HREF,
+					(xmlChar*)LASSO_SAML_ASSERTION_PREFIX));
+		if (xmlHasNsProp(t, (xmlChar*)"type", (xmlChar*)LASSO_XSI_HREF) == NULL)
+			xmlNewNsProp(t, xmlNewNs(xmlnode,
+						(xmlChar*)LASSO_XSI_HREF,
+						(xmlChar*)LASSO_XSI_PREFIX),
+					(xmlChar*)"type", (xmlChar*)"lib:AssertionType");
 	}
 
 	return xmlnode;
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index c5319648..724fed30 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -80,9 +80,9 @@ lasso_node_dump(LassoNode *node)
 	xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL);
 	xmlOutputBufferFlush(buf);
 	if (buf->conv != NULL) {
-		ret = g_strdup(buf->conv->content);
+		ret = g_strdup((char*)buf->conv->content);
 	} else {
-		ret = g_strdup(buf->buffer->content);
+		ret = g_strdup((char*)buf->buffer->content);
 	}
 	xmlOutputBufferClose(buf);
 
@@ -125,7 +125,7 @@ lasso_node_export_to_base64(LassoNode *node)
 	xmlNode *message;
 	xmlOutputBufferPtr buf;
 	xmlCharEncodingHandlerPtr handler = NULL;
-	char *buffer;
+	xmlChar *buffer;
 	char *ret;
 
 	message = lasso_node_get_xmlNode(node, FALSE);
@@ -136,7 +136,7 @@ lasso_node_export_to_base64(LassoNode *node)
 	xmlOutputBufferFlush(buf);
 	buffer = buf->conv ? buf->conv->content : buf->buffer->content;
 
-	ret = xmlSecBase64Encode(buffer, strlen(buffer), 0);
+	ret = (char*)xmlSecBase64Encode(buffer, strlen((char*)buffer), 0);
 	xmlOutputBufferClose(buf);
 
 	return ret;
@@ -193,17 +193,18 @@ lasso_node_export_to_soap(LassoNode *node)
 
 	message = lasso_node_get_xmlNode(node, FALSE);
 
-	envelope = xmlNewNode(NULL, "Envelope");
-	xmlSetNs(envelope, xmlNewNs(envelope, LASSO_SOAP_ENV_HREF, LASSO_SOAP_ENV_PREFIX));
+	envelope = xmlNewNode(NULL, (xmlChar*)"Envelope");
+	xmlSetNs(envelope, xmlNewNs(envelope,
+				(xmlChar*)LASSO_SOAP_ENV_HREF, (xmlChar*)LASSO_SOAP_ENV_PREFIX));
 
-	body = xmlNewTextChild(envelope, NULL, "Body", NULL);
+	body = xmlNewTextChild(envelope, NULL, (xmlChar*)"Body", NULL);
 	xmlAddChild(body, message);
 
 	handler = xmlFindCharEncodingHandler("utf-8");
 	buf = xmlAllocOutputBuffer(handler);
 	xmlNodeDumpOutput(buf, NULL, envelope, 0, 0, "utf-8");
 	xmlOutputBufferFlush(buf);
-	ret = g_strdup( buf->conv ? buf->conv->content : buf->buffer->content );
+	ret = g_strdup( (char*)(buf->conv ? buf->conv->content : buf->buffer->content) );
 	xmlOutputBufferClose(buf);
 
 	xmlFreeNode(envelope);
@@ -332,7 +333,7 @@ lasso_node_impl_init_from_xml(LassoNode *node, xmlNode *xmlnode)
 				type = snippet->type & 0xff;
 				value = G_STRUCT_MEMBER_P(node, snippet->offset);
 
-				if (strcmp(t->name, snippet->name) != 0 && snippet->name[0])
+				if (strcmp((char*)t->name, snippet->name) != 0 && snippet->name[0])
 					continue;
 
 				if (type == SNIPPET_NODE) {
@@ -385,7 +386,7 @@ lasso_node_impl_init_from_xml(LassoNode *node, xmlNode *xmlnode)
 			type = snippet->type & 0xff;
 			value = G_STRUCT_MEMBER_P(node, snippet->offset);
 			if (type == SNIPPET_ATTRIBUTE)
-				tmp = xmlGetProp(xmlnode, snippet->name);
+				tmp = xmlGetProp(xmlnode, (xmlChar*)snippet->name);
 			if (type == SNIPPET_TEXT_CHILD)
 				tmp = xmlNodeGetContent(xmlnode);
 			if (tmp == NULL)
@@ -433,7 +434,7 @@ lasso_node_impl_get_xmlNode(LassoNode *node, gboolean lasso_dump)
 	if (class->node_data == NULL)
 		return NULL;
 
-	xmlnode = xmlNewNode(NULL, class->node_data->node_name);
+	xmlnode = xmlNewNode(NULL, (xmlChar*)class->node_data->node_name);
 	while (class && LASSO_IS_NODE_CLASS(class) && class->node_data) {
 		if (class->node_data->ns)
 			list_ns = g_list_append(list_ns, class->node_data->ns);
@@ -472,10 +473,10 @@ lasso_node_impl_get_xmlNode(LassoNode *node, gboolean lasso_dump)
 		value = G_STRUCT_MEMBER_P(value_node, version_snippet->offset);
 		minor_version = *value;
 
-		if (strcmp(xmlnode->ns->href, LASSO_LIB_HREF) == 0) {
+		if (strcmp((char*)xmlnode->ns->href, LASSO_LIB_HREF) == 0) {
 			if (major_version == 1 && minor_version == 0) {
 				xmlFree((xmlChar*)xmlnode->ns->href); /* warning: discard const */
-				xmlnode->ns->href = xmlStrdup(
+				xmlnode->ns->href = xmlStrdup((xmlChar*)
 						"http://projectliberty.org/schemas/core/2002/12");
 			}
 		}
@@ -684,8 +685,8 @@ lasso_node_new_from_soap(const char *soap)
 
 	doc = xmlParseMemory(soap, strlen(soap));
 	xpathCtx = xmlXPathNewContext(doc);
-	xmlXPathRegisterNs(xpathCtx, "s", LASSO_SOAP_ENV_HREF);
-	xpathObj = xmlXPathEvalExpression("//s:Body/*", xpathCtx);
+	xmlXPathRegisterNs(xpathCtx, (xmlChar*)"s", (xmlChar*)LASSO_SOAP_ENV_HREF);
+	xpathObj = xmlXPathEvalExpression((xmlChar*)"//s:Body/*", xpathCtx);
 
 	if (xpathObj && xpathObj->nodesetval && xpathObj->nodesetval->nodeNr) {
 		xmlnode = xpathObj->nodesetval->nodeTab[0];
@@ -714,7 +715,7 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 	char *typename;
 	GType gtype;
 	LassoNode *node;
-	char *xsitype;
+	xmlChar *xsitype;
 	int rc;
 
 	if (xmlnode == NULL || xmlnode->ns == NULL) {
@@ -722,40 +723,40 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 		return NULL;
 	}
 
-	if (strcmp(xmlnode->ns->href, LASSO_SOAP_ENV_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_SOAP_ENV_HREF) == 0)
 		prefix = "Soap";
-	if (strcmp(xmlnode->ns->href, LASSO_SOAP_BINDING_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_SOAP_BINDING_HREF) == 0)
 		prefix = "SoapBinding";
-	if (strcmp(xmlnode->ns->href, LASSO_DISCO_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_DISCO_HREF) == 0)
 		prefix = "Disco";
-	if (strcmp(xmlnode->ns->href, LASSO_LIB_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_LIB_HREF) == 0)
 		prefix = "Lib";
-	if (strcmp(xmlnode->ns->href, LASSO_LASSO_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_LASSO_HREF) == 0)
 		prefix = "";
-	if (strcmp(xmlnode->ns->href, LASSO_SA_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_SA_HREF) == 0)
 		prefix = "Sa";
-	if (strcmp(xmlnode->ns->href, LASSO_SAML_ASSERTION_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_SAML_ASSERTION_HREF) == 0)
 		prefix = "Saml";
-	if (strcmp(xmlnode->ns->href, LASSO_SAML_PROTOCOL_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_SAML_PROTOCOL_HREF) == 0)
 		prefix = "Samlp";
-	if (strcmp(xmlnode->ns->href, LASSO_WSSE_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_WSSE_HREF) == 0)
 		prefix = "Wsse";
 
 	/* XXX: new Dst namespaces can be added dynamically; they should not
 	 * be hardcoded here
 	 */
-	if (strcmp(xmlnode->ns->href, LASSO_PP_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_PP_HREF) == 0)
 		prefix = "Dst";
-	if (strcmp(xmlnode->ns->href, LASSO_EP_HREF) == 0)
+	if (strcmp((char*)xmlnode->ns->href, LASSO_EP_HREF) == 0)
 		prefix = "Dst";
-	if (strcmp(prefix, "Dst") == 0 && strcmp(xmlnode->name, "Status") == 0)
+	if (strcmp((char*)prefix, "Dst") == 0 && strcmp((char*)xmlnode->name, "Status") == 0)
 		prefix = "Utility";
-	if (strcmp(prefix, "Disco") == 0 && strcmp(xmlnode->name, "Status") == 0)
+	if (strcmp((char*)prefix, "Disco") == 0 && strcmp((char*)xmlnode->name, "Status") == 0)
 		prefix = "Utility";
-	if (strcmp(prefix, "Sa") == 0 && strcmp(xmlnode->name, "Status") == 0)
+	if (strcmp((char*)prefix, "Sa") == 0 && strcmp((char*)xmlnode->name, "Status") == 0)
 		prefix = "Utility";
 
-	xsitype = xmlGetNsProp(xmlnode, "type", LASSO_XSI_HREF);
+	xsitype = xmlGetNsProp(xmlnode, (xmlChar*)"type", (xmlChar*)LASSO_XSI_HREF);
 	if (xsitype) {
 		/* XXX: should look for proper namespace prefix declaration
 		 * and not assumes blindly that lib: is the liberty prefix;
@@ -763,7 +764,7 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 		 * instead of falling back to good ol' xmlnode->name later.
 		 * yada yada
 		 */
-		if (strncmp(xsitype, "lib:", 4) == 0)
+		if (strncmp((char*)xsitype, "lib:", 4) == 0)
 			prefix = "Lib";
 		xmlFree(xsitype);
 	}
@@ -825,7 +826,7 @@ lasso_node_init_from_message(LassoNode *node, const char *message)
 	msg = (char*)message;
 	if (message[0] != 0 && is_base64(message)) {
 		msg = g_malloc(strlen(message));
-		rc = xmlSecBase64Decode(message, msg, strlen(message));
+		rc = xmlSecBase64Decode((xmlChar*)message, (xmlChar*)msg, strlen(message));
 		if (rc >= 0) {
 			b64 = TRUE;
 		} else {
@@ -846,10 +847,10 @@ lasso_node_init_from_message(LassoNode *node, const char *message)
 		if (doc == NULL)
 			return LASSO_MESSAGE_FORMAT_UNKNOWN;
 		root = xmlDocGetRootElement(doc);
-		if (root->ns && strcmp(root->ns->href, LASSO_SOAP_ENV_HREF) == 0) {
+		if (root->ns && strcmp((char*)root->ns->href, LASSO_SOAP_ENV_HREF) == 0) {
 			xpathCtx = xmlXPathNewContext(doc);
-			xmlXPathRegisterNs(xpathCtx, "s", LASSO_SOAP_ENV_HREF);
-			xpathObj = xmlXPathEvalExpression("//s:Body/*", xpathCtx);
+			xmlXPathRegisterNs(xpathCtx, (xmlChar*)"s", (xmlChar*)LASSO_SOAP_ENV_HREF);
+			xpathObj = xmlXPathEvalExpression((xmlChar*)"//s:Body/*", xpathCtx);
 			if (xpathObj->nodesetval && xpathObj->nodesetval->nodeNr ) {
 				root = xpathObj->nodesetval->nodeTab[0];
 			}
@@ -926,7 +927,7 @@ lasso_node_class_set_ns(LassoNodeClass *klass, char *href, char *prefix)
 {
 	if (klass->node_data->ns)
 		xmlFreeNs(klass->node_data->ns);
-	klass->node_data->ns = xmlNewNs(NULL, href, prefix);
+	klass->node_data->ns = xmlNewNs(NULL, (xmlChar*)href, (xmlChar*)prefix);
 }
 
 static void
@@ -963,28 +964,29 @@ lasso_node_build_xmlNode_from_snippets(LassoNode *node, xmlNode *xmlnode,
 
 		switch (type) {
 			case SNIPPET_ATTRIBUTE:
-				xmlSetProp(xmlnode, snippet->name, str);
+				xmlSetProp(xmlnode, (xmlChar*)snippet->name, (xmlChar*)str);
 				break;
 			case SNIPPET_TEXT_CHILD:
-				xmlAddChild(xmlnode, xmlNewText(str));
+				xmlAddChild(xmlnode, xmlNewText((xmlChar*)str));
 				break;
 			case SNIPPET_NODE:
 				xmlAddChild(xmlnode, lasso_node_get_xmlNode(
 							LASSO_NODE(value), lasso_dump));
 				break;
 			case SNIPPET_CONTENT:
-				xmlNewTextChild(xmlnode, NULL, snippet->name, str);
+				xmlNewTextChild(xmlnode, NULL,
+						(xmlChar*)snippet->name, (xmlChar*)str);
 				break;
 			case SNIPPET_NAME_IDENTIFIER:
-				xmlns = xmlNewNs(NULL, LASSO_LIB_HREF, LASSO_LIB_PREFIX);
-
+				xmlns = xmlNewNs(NULL, (xmlChar*)LASSO_LIB_HREF,
+						(xmlChar*)LASSO_LIB_PREFIX);
 				t = xmlAddChild(xmlnode, lasso_node_get_xmlNode(
 							LASSO_NODE(value), lasso_dump));
-				xmlNodeSetName(t, snippet->name);
+				xmlNodeSetName(t, (xmlChar*)snippet->name);
 				xmlSetNs(t, xmlns);
 				break;
 			case SNIPPET_NODE_IN_CHILD:
-				t = xmlNewTextChild(xmlnode, NULL, snippet->name, NULL);
+				t = xmlNewTextChild(xmlnode, NULL, (xmlChar*)snippet->name, NULL);
 				xmlAddChild(t, lasso_node_get_xmlNode(
 							LASSO_NODE(value), lasso_dump));
 				break;
@@ -1002,8 +1004,8 @@ lasso_node_build_xmlNode_from_snippets(LassoNode *node, xmlNode *xmlnode,
 				 * no attrs, just content) */
 				elem = (GList *)value;
 				while (elem) {
-					xmlNewTextChild(xmlnode, NULL,
-							snippet->name, (char*)(elem->data));
+					xmlNewTextChild(xmlnode, NULL, (xmlChar*)snippet->name,
+							(xmlChar*)(elem->data));
 					elem = g_list_next(elem);
 				}
 				break;
@@ -1075,7 +1077,7 @@ void lasso_node_add_signature_template(LassoNode *node, xmlNode *xmlnode,
 	id = G_STRUCT_MEMBER(char*, node, snippet_signature->offset);
 	uri = g_strdup_printf("#%s", id);
 	reference = xmlSecTmplSignatureAddReference(signature,
-			xmlSecTransformSha1Id, NULL, uri, NULL);
+			xmlSecTransformSha1Id, NULL, (xmlChar*)uri, NULL);
 	g_free(uri);
 
 	/* add enveloped transform */
@@ -1194,11 +1196,11 @@ get_value_by_path(LassoNode *node, char *path, struct XmlSnippet *xml_snippet)
 					continue;
 				if (result->len)
 					g_string_append(result, "&");
-				g_string_append(result, c->name);
+				g_string_append(result, (char*)c->name);
 				g_string_append(result, "=");
 				s = xmlNodeGetContent(c);
 				s2 = xmlURIEscapeStr(s, NULL);
-				g_string_append(result, s2);
+				g_string_append(result, (char*)s2);
 				xmlFree(s2);
 				xmlFree(s);
 			}
@@ -1316,8 +1318,8 @@ lasso_node_build_query_from_snippets(LassoNode *node)
 				g_string_append(s, "&");
 			g_string_append(s, field_name);
 			g_string_append(s, "=");
-			t = xmlURIEscapeStr(v, NULL);
-			g_string_append(s, t);
+			t = xmlURIEscapeStr((xmlChar*)v, NULL);
+			g_string_append(s, (char*)t);
 			xmlFree(t);
 		}
 		if (v)
@@ -1383,11 +1385,13 @@ lasso_node_init_from_query_fields(LassoNode *node, char **query_fields)
 				if (*value) {
 					xmlnode = (*value)->data;
 				} else {
-					xmlnode = xmlNewNode(xmlNewNs(NULL, LASSO_LIB_HREF,
-								LASSO_LIB_PREFIX), "Extension");
+					xmlnode = xmlNewNode(xmlNewNs(NULL,
+								(xmlChar*)LASSO_LIB_HREF,
+								(xmlChar*)LASSO_LIB_PREFIX),
+							(xmlChar*)"Extension");
 				}
-				xmlchild = xmlNewNode(NULL, field);
-				xmlAddChild(xmlchild, xmlNewText(t+1));
+				xmlchild = xmlNewNode(NULL, (xmlChar*)field);
+				xmlAddChild(xmlchild, xmlNewText((xmlChar*)t+1));
 				xmlAddChild(xmlnode, xmlchild);
 				if (! *value)
 					*value = g_list_append(*value, xmlnode);
@@ -1405,11 +1409,11 @@ xmlDeclareNs(xmlNode *root_node, xmlNode *node)
 	xmlNs *ns;
 	xmlNode *t;
 
-	if (strcmp(node->name, "Signature") == 0)
+	if (strcmp((char*)node->name, "Signature") == 0)
 		return;
 
 	for (ns = node->nsDef; ns; ns = ns->next)
-		if (strcmp(ns->prefix, "xsi") != 0)
+		if (strcmp((char*)ns->prefix, "xsi") != 0)
 			xmlNewNs(root_node, ns->href, ns->prefix);
 	for (t = node->children; t; t = t->next)
 		if (t->type == XML_ELEMENT_NODE)
@@ -1424,7 +1428,7 @@ sameNs(xmlNs *ns1, xmlNs *ns2)
 	 */
 	return (ns1 == NULL && ns2 == NULL) || (
 			ns1 && ns2 && ns1->prefix && ns2->prefix &&
-			strcmp(ns1->prefix, ns2->prefix) == 0);
+			strcmp((char*)ns1->prefix, (char*)ns2->prefix) == 0);
 }
 
 static void