OID_UNKNOWN (-1) requires int type

6 files changed, 15 insertions, 19 deletions

diff --git a/src/libstrongswan/crypto/ac.c b/src/libstrongswan/crypto/ac.c
index af7ebc092..7ef91fcd2 100644
--- a/src/libstrongswan/crypto/ac.c
+++ b/src/libstrongswan/crypto/ac.c
@@ -618,9 +618,9 @@ static bool parse_certificate(chunk_t blob, private_x509ac_t *this)
 	bool critical;
 	chunk_t object;
 	u_int level;
-	u_int type = OID_UNKNOWN;
-	u_int extn_oid = OID_UNKNOWN;
 	int objectID = 0;
+	int type = OID_UNKNOWN;
+	int extn_oid = OID_UNKNOWN;
 
 	asn1_init(&ctx, blob, 0, FALSE, FALSE);
 	while (objectID < AC_OBJ_ROOF)
diff --git a/src/libstrongswan/crypto/ocsp.c b/src/libstrongswan/crypto/ocsp.c
index 0d8093e4a..dcdab43a4 100644
--- a/src/libstrongswan/crypto/ocsp.c
+++ b/src/libstrongswan/crypto/ocsp.c
@@ -466,11 +466,11 @@ static chunk_t ocsp_build_request(private_ocsp_t *this)
 static bool ocsp_parse_basic_response(chunk_t blob, int level0, response_t *res)
 {
 	u_int level, version;
-	u_int extn_oid = OID_UNKNOWN;
 	asn1_ctx_t ctx;
 	bool critical;
 	chunk_t object;
 	int objectID = 0;
+	int extn_oid = OID_UNKNOWN;
 
 	asn1_init(&ctx, blob, level0, FALSE, FALSE);
 
@@ -546,9 +546,8 @@ static response_status ocsp_parse_response(response_t *res)
 	chunk_t object;
 	u_int level;
 	int objectID = 0;
-
+	int ocspResponseType = OID_UNKNOWN;
 	response_status rStatus = STATUS_INTERNALERROR;
-	u_int ocspResponseType = OID_UNKNOWN;
 
 	asn1_init(&ctx, res->chunk, 0, FALSE, FALSE);
 
diff --git a/src/libstrongswan/crypto/x509.c b/src/libstrongswan/crypto/x509.c
index 4e7be4688..d68fdbf2c 100755
--- a/src/libstrongswan/crypto/x509.c
+++ b/src/libstrongswan/crypto/x509.c
@@ -453,8 +453,8 @@ parse_otherName(chunk_t blob, int level0)
 {
 	asn1_ctx_t ctx;
 	chunk_t object;
-	int objectID = 0;
 	u_int level;
+	int objectID = 0;
 	int oid = OID_UNKNOWN;
 
 	asn1_init(&ctx, blob, level0, FALSE, FALSE);
@@ -639,8 +639,7 @@ static void parse_authorityInfoAccess(chunk_t blob, int level0, linked_list_t *l
 	chunk_t object;
 	u_int level;
 	int objectID = 0;
-	
-	u_int accessMethod = OID_UNKNOWN;
+	int accessMethod = OID_UNKNOWN;
 	
 	asn1_init(&ctx, blob, level0, FALSE, FALSE);
 	while (objectID < AUTH_INFO_ACCESS_ROOF)
@@ -759,8 +758,8 @@ static bool parse_certificate(chunk_t blob, u_int level0, private_x509_t *this)
 	bool critical;
 	chunk_t object;
 	u_int level;
-	u_int extn_oid = OID_UNKNOWN;
 	int objectID = 0;
+	int extn_oid = OID_UNKNOWN;
 	
 	asn1_init(&ctx, blob, level0, FALSE, FALSE);
 	while (objectID < X509_OBJ_ROOF)
diff --git a/src/pluto/ac.c b/src/pluto/ac.c
index 3eea23936..09dd548a8 100644
--- a/src/pluto/ac.c
+++ b/src/pluto/ac.c
@@ -460,9 +460,9 @@ parse_ac(chunk_t blob, x509acert_t *ac)
     bool critical;
     chunk_t object;
     u_int level;
-    u_int type = OID_UNKNOWN;
-    u_int extn_oid = OID_UNKNOWN;
     int objectID = 0;
+    int type = OID_UNKNOWN;
+    int extn_oid = OID_UNKNOWN;
 
     asn1_init(&ctx, blob, 0, FALSE, DBG_RAW);
 
diff --git a/src/pluto/ocsp.c b/src/pluto/ocsp.c
index e3d6514c6..5f7b1afeb 100644
--- a/src/pluto/ocsp.c
+++ b/src/pluto/ocsp.c
@@ -1087,13 +1087,13 @@ valid_ocsp_response(response_t *res)
 static bool
 parse_basic_ocsp_response(chunk_t blob, int level0, response_t *res)
 {
-    u_int level, version;
-    u_int extn_oid = OID_UNKNOWN;
-    u_char buf[BUF_LEN];
     asn1_ctx_t ctx;
     bool critical;
     chunk_t object;
+    u_int level, version;
+    u_char buf[BUF_LEN];
     int objectID = 0;
+    int extn_oid = OID_UNKNOWN;
 
     asn1_init(&ctx, blob, level0, FALSE, DBG_RAW);
 
@@ -1190,9 +1190,8 @@ parse_ocsp_response(chunk_t blob, response_t * res)
     chunk_t object;
     u_int level;
     int objectID = 0;
-
+    int ocspResponseType = OID_UNKNOWN;
     response_status rStatus = STATUS_INTERNALERROR;
-    u_int ocspResponseType = OID_UNKNOWN;
 
     asn1_init(&ctx, blob, 0, FALSE, DBG_RAW);
 
diff --git a/src/pluto/x509.c b/src/pluto/x509.c
index 9ed708ace..041eb1505 100644
--- a/src/pluto/x509.c
+++ b/src/pluto/x509.c
@@ -1701,8 +1701,7 @@ parse_authorityInfoAccess(chunk_t blob, int level0, chunk_t *accessLocation)
     chunk_t object;
     u_int level;
     int objectID = 0;
-
-    u_int accessMethod = OID_UNKNOWN;
+    int accessMethod = OID_UNKNOWN;
 
     asn1_init(&ctx, blob, level0, FALSE, DBG_RAW);
 
@@ -1829,8 +1828,8 @@ parse_x509cert(chunk_t blob, u_int level0, x509cert_t *cert)
     bool critical;
     chunk_t object;
     u_int level;
-    u_int extn_oid = OID_UNKNOWN;
     int objectID = 0;
+    int extn_oid = OID_UNKNOWN;
 
     asn1_init(&ctx, blob, level0, FALSE, DBG_RAW);