From fb4321ce0ff1908c132d6611124db0ae1b85f993 Mon Sep 17 00:00:00 2001
From: aet <aet@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Tue, 1 Jan 2002 19:56:07 +0000
Subject: [PATCH] More size_t fixes

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@128 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/libopensc/asn1.c         | 3 ++-
 src/libopensc/pkcs15-cert.c  | 5 +++--
 src/libopensc/pkcs15-pin.c   | 5 +++--
 src/libopensc/pkcs15-prkey.c | 5 +++--
 src/libopensc/pkcs15.c       | 3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/libopensc/asn1.c b/src/libopensc/asn1.c
index e22b4a98..9535b9d6 100644
--- a/src/libopensc/asn1.c
+++ b/src/libopensc/asn1.c
@@ -179,8 +179,9 @@ static void print_tags_recursive(const u8 * buf0, const u8 * buf,
 	const u8 *p = buf;
 
 	while (bytesleft >= 2) {
-		int cla, tag, len, hlen;
+		unsigned int cla, tag, hlen;
 		const u8 *tagp = p;
+		size_t len;
 
 		r = read_tag(&tagp, bytesleft, &cla, &tag, &len);
 		if (r < 0) {
diff --git a/src/libopensc/pkcs15-cert.c b/src/libopensc/pkcs15-cert.c
index 2767ea6a..79abf8e9 100644
--- a/src/libopensc/pkcs15-cert.c
+++ b/src/libopensc/pkcs15-cert.c
@@ -279,7 +279,7 @@ int sc_pkcs15_read_certificate(struct sc_pkcs15_card *p15card,
 
 static int parse_x509_cert_info(struct sc_context *ctx,
 				struct sc_pkcs15_cert_info *cert,
-				const u8 ** buf, int *buflen)
+				const u8 ** buf, size_t *buflen)
 {
 	u8 id_value[128];
 	int id_type, id_value_len = sizeof(id_value);
@@ -334,7 +334,8 @@ void sc_pkcs15_print_cert_info(const struct sc_pkcs15_cert_info *cert)
 static int get_certs_from_file(struct sc_pkcs15_card *card,
 			       struct sc_file *file)
 {
-	int r, bytes_left;
+	int r;
+	size_t bytes_left;
 	u8 buf[2048];
 	const u8 *p = buf;
 
diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c
index 57491bd3..6d357c84 100644
--- a/src/libopensc/pkcs15-pin.c
+++ b/src/libopensc/pkcs15-pin.c
@@ -29,7 +29,7 @@
 
 static int parse_pin_info(struct sc_context *ctx,
 			  struct sc_pkcs15_pin_info *pin,
-			  const u8 ** buf, int *buflen)
+			  const u8 ** buf, size_t *buflen)
 {
 	int r;
 	struct sc_asn1_struct asn1_com_ao_attr[] = {
@@ -98,7 +98,8 @@ void sc_pkcs15_print_pin_info(const struct sc_pkcs15_pin_info *pin)
 static int get_pins_from_file(struct sc_pkcs15_card *card,
 			      struct sc_file *file)
 {
-	int r, bytes_left;
+	int r;
+	size_t bytes_left;
 	u8 buf[2048];
 	const u8 *p = buf;
 
diff --git a/src/libopensc/pkcs15-prkey.c b/src/libopensc/pkcs15-prkey.c
index e9e2d73c..52a4ad94 100644
--- a/src/libopensc/pkcs15-prkey.c
+++ b/src/libopensc/pkcs15-prkey.c
@@ -50,7 +50,7 @@ void sc_pkcs15_print_prkey_info(const struct sc_pkcs15_prkey_info *prkey)
 
 static int parse_rsa_prkey_info(struct sc_context *ctx,
 				struct sc_pkcs15_prkey_info *prkey,
-				const u8 **buf, int *buflen)
+				const u8 **buf, size_t *buflen)
 {
 	int r;
 	int usage_len = sizeof(prkey->usage);
@@ -95,7 +95,8 @@ static int parse_rsa_prkey_info(struct sc_context *ctx,
 static int get_prkeys_from_file(struct sc_pkcs15_card *card,
 				struct sc_file *file)
 {
-	int r, bytes_left;
+	int r;
+	size_t bytes_left;
 	u8 buf[2048];
 	const u8 *p = buf;
 
diff --git a/src/libopensc/pkcs15.c b/src/libopensc/pkcs15.c
index 95b9081a..5577e336 100644
--- a/src/libopensc/pkcs15.c
+++ b/src/libopensc/pkcs15.c
@@ -163,7 +163,8 @@ static int parse_dir(const u8 * buf, size_t buflen, struct sc_pkcs15_card *card)
 static int parse_odf(const u8 * buf, int buflen, struct sc_pkcs15_card *card)
 {
 	const u8 *p = buf;
-	int r, left = buflen;
+	size_t left = buflen;
+	int r;
 	struct sc_path path;
 	struct sc_asn1_struct asn1_obj_or_path[] = {
 		{ "path", SC_ASN1_PATH, SC_ASN1_CONS | SC_ASN1_SEQUENCE, 0, &path },