From 05a01a824715de7e8e5d3d65b73e8fc855e5dad9 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Sun, 8 Sep 2013 21:23:30 +0200
Subject: [PATCH] fix compilation errors on 64bits architectures

 * sizeof(unsigned int) != sizeof(size_t)
 * INT_MAX != LONG_MAX
---
 lasso/saml-2.0/provider.c | 2 +-
 lasso/xml/tools.c         | 2 +-
 lasso/xml/xml.c           | 2 +-
 tests/basic_tests.c       | 2 +-
 tests/login_tests.c       | 2 +-
 tests/login_tests_saml2.c | 2 +-
 tests/tests2.c            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lasso/saml-2.0/provider.c b/lasso/saml-2.0/provider.c
index a66ba9f2..f86eb8f1 100644
--- a/lasso/saml-2.0/provider.c
+++ b/lasso/saml-2.0/provider.c
@@ -153,7 +153,7 @@ xsdUnsignedShortParse(xmlChar *value, int *out) {
 
 	errno = 0;
 	l = strtol((char*)value, NULL, 10);
-	if (((l == LONG_MIN || l == LONG_MAX) && errno == ERANGE) ||
+	if (((l == INT_MIN || l == INT_MAX) && errno == ERANGE) ||
 			errno == EINVAL || l < 0 || l >= 65535) {
 		return FALSE;
 	}
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index f73cb1f2..9eb7e57b 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -639,7 +639,7 @@ lasso_query_verify_helper(const char *signed_content, const char *b64_signature,
 	xmlSecByte *signature = NULL;
 	int key_size = 0;
 	unsigned char *hmac_key = NULL;
-	unsigned int hmac_key_length = 0;
+	size_t hmac_key_length = 0;
 	const EVP_MD *md = NULL;
 	lasso_error_t rc = 0;
 	LassoSignatureMethod method = LASSO_SIGNATURE_METHOD_NONE;
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index e3ac905d..488cd5d8 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1295,7 +1295,7 @@ snippet_set_value(LassoNode *node, LassoNodeClass *class, struct XmlSnippet *sni
 	value = SNIPPET_STRUCT_MEMBER_P(node, g_type, snippet);
 	if (snippet->type & SNIPPET_INTEGER) {
 		int val = strtol((char*)content, NULL, 10);
-		if (((val == LONG_MIN || val == LONG_MAX) && errno == ERANGE)
+		if (((val == INT_MIN || val == INT_MAX) && errno == ERANGE)
 				|| errno == EINVAL || val < 0) {
 			if (snippet->type & SNIPPET_OPTIONAL_NEG) {
 				val = -1;
diff --git a/tests/basic_tests.c b/tests/basic_tests.c
index 23ce4313..a75174eb 100644
--- a/tests/basic_tests.c
+++ b/tests/basic_tests.c
@@ -187,7 +187,7 @@ END_TEST
 START_TEST(test09_test_deserialization)
 {
 	char *content = NULL;
-	unsigned int len = 0;
+	size_t len = 0;
 	LassoNode *node;
 
 	g_file_get_contents(TESTSDATADIR "/response-1", &content, &len, NULL);
diff --git a/tests/login_tests.c b/tests/login_tests.c
index c1688b02..7cbacb73 100644
--- a/tests/login_tests.c
+++ b/tests/login_tests.c
@@ -90,7 +90,7 @@ generateIdentityProviderContextDumpMemory()
 	char *metadata;
 	char *private_key;
 	char *certificate;
-	guint len;
+	size_t len;
 	char *ret;
 
 	g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &metadata, &len, NULL);
diff --git a/tests/login_tests_saml2.c b/tests/login_tests_saml2.c
index 624556d8..4b09b6a2 100644
--- a/tests/login_tests_saml2.c
+++ b/tests/login_tests_saml2.c
@@ -93,7 +93,7 @@ generateIdentityProviderContextDumpMemory()
 	char *metadata = NULL;
 	char *private_key = NULL;
 	char *certificate = NULL;
-	guint len;
+	size_t len;
 	char *ret = NULL;
 
 	g_file_get_contents(TESTSDATADIR "/idp5-saml2/metadata.xml", &metadata, &len, NULL);
diff --git a/tests/tests2.c b/tests/tests2.c
index 821dc286..808af6a9 100644
--- a/tests/tests2.c
+++ b/tests/tests2.c
@@ -6,7 +6,7 @@
 void load(char *file) {
 	LassoNode *node = NULL;
 	char *content;
-	guint len;
+	size_t len;
 	xmlNode *xmlnode;
 
 	g_file_get_contents(file, &content, &len, NULL);