[pkg-opensc-commit] [libp11] 55/67: Type conversion warnings analyzed and squashed

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit ee82e1e7474df9156c04304b9421cb9e20949ffa
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Jan 19 13:22:52 2016 +0100

    Type conversion warnings analyzed and squashed
---
 src/p11_attr.c |  4 ++--
 src/p11_cert.c |  2 +-
 src/p11_ec.c   |  4 ++--
 src/p11_slot.c | 11 ++++++-----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/p11_attr.c b/src/p11_attr.c
index 81cbee6..d46bc02 100644
--- a/src/p11_attr.c
+++ b/src/p11_attr.c
@@ -99,7 +99,7 @@ pkcs11_getattr_bn(PKCS11_TOKEN * token, CK_OBJECT_HANDLE object,
 
 	/*
 	 * @ALON: invalid object,
-	 * not sure it will survice the ulValueLen->size_t and keep sign at all platforms
+	 * not sure it will survive the ulValueLen->size_t and keep sign at all platforms
 	 */
 	if (size == (size_t)-1) {
 		PKCS11err(PKCS11_F_PKCS11_GETATTR,
@@ -107,7 +107,7 @@ pkcs11_getattr_bn(PKCS11_TOKEN * token, CK_OBJECT_HANDLE object,
 		ret = -1;
 		goto cleanup;
 	}
-	*bn = BN_bin2bn(binary, size, *bn);
+	*bn = BN_bin2bn(binary, (int) size, *bn);
 	ret = *bn ? 0 : -1;
 
  cleanup:
diff --git a/src/p11_cert.c b/src/p11_cert.c
index f8658c4..e53cad5 100644
--- a/src/p11_cert.c
+++ b/src/p11_cert.c
@@ -187,7 +187,7 @@ static int pkcs11_init_cert(PKCS11_CTX * ctx, PKCS11_TOKEN * token,
 			if (!pkcs11_getattr_var(token, obj, CKA_VALUE, data, &size)) {
 				const unsigned char *p = data;
 
-				cert->x509 = d2i_X509(NULL, &p, size);
+				cert->x509 = d2i_X509(NULL, &p, (long) size);
 			}
 			OPENSSL_free(data);
 		}
diff --git a/src/p11_ec.c b/src/p11_ec.c
index a8a811e..3a7ca4d 100644
--- a/src/p11_ec.c
+++ b/src/p11_ec.c
@@ -139,7 +139,7 @@ static EVP_PKEY *pkcs11_get_evp_key_ec(PKCS11_KEY * key)
 			if (ckrv == CKR_OK) {
 				const unsigned char * a = ec_params;
 				/* convert to OpenSSL parmas */
-				d2i_ECParameters(&ec, &a, ec_paramslen);
+				d2i_ECParameters(&ec, &a, (long) ec_paramslen);
 			}
 		}
 	}
@@ -158,7 +158,7 @@ static EVP_PKEY *pkcs11_get_evp_key_ec(PKCS11_KEY * key)
 					/* we have asn1 octet string, need to strip off 04 len */
 
 					a = ec_point;
-					os = d2i_ASN1_OCTET_STRING(NULL, &a, ec_pointlen);
+					os = d2i_ASN1_OCTET_STRING(NULL, &a, (long) ec_pointlen);
 					if (os) {
 						a = os->data;
 						o2i_ECPublicKey(&ec, &a, os->length);
diff --git a/src/p11_slot.c b/src/p11_slot.c
index f849f06..1de1a9e 100644
--- a/src/p11_slot.c
+++ b/src/p11_slot.c
@@ -233,7 +233,7 @@ int pkcs11_login(PKCS11_SLOT * slot, int so, const char *pin, int relogin)
 
 	rv = CRYPTOKI_call(ctx,
 		C_Login(priv->session, so ? CKU_SO : CKU_USER,
-			(CK_UTF8CHAR *) pin, pin ? strlen(pin) : 0));
+			(CK_UTF8CHAR *) pin, pin ? (unsigned long) strlen(pin) : 0));
 	if (rv && rv != CKR_USER_ALREADY_LOGGED_IN) /* logged in -> OK */
 		CRYPTOKI_checkerr(PKCS11_F_PKCS11_LOGIN, rv);
 	priv->loggedIn = 1;
@@ -309,7 +309,8 @@ int PKCS11_init_token(PKCS11_TOKEN * token, const char *pin, const char *label)
 		label = "PKCS#11 Token";
 	rv = CRYPTOKI_call(ctx,
 		C_InitToken(priv->id,
-			(CK_UTF8CHAR *) pin, strlen(pin), (CK_UTF8CHAR *) label));
+			(CK_UTF8CHAR *) pin, (unsigned long) strlen(pin),
+			(CK_UTF8CHAR *) label));
 	CRYPTOKI_checkerr(PKCS11_F_PKCS11_INIT_TOKEN, rv);
 
 	/* FIXME: how to update the token?
@@ -341,7 +342,7 @@ int PKCS11_init_pin(PKCS11_TOKEN * token, const char *pin)
 		return -1;
 	}
 
-	len = pin ? strlen(pin) : 0;
+	len = pin ? (int) strlen(pin) : 0;
 	rv = CRYPTOKI_call(ctx, C_InitPIN(priv->session, (CK_UTF8CHAR *) pin, len));
 	CRYPTOKI_checkerr(PKCS11_F_PKCS11_INIT_PIN, rv);
 
@@ -365,8 +366,8 @@ int PKCS11_change_pin(PKCS11_SLOT * slot, const char *old_pin,
 		return -1;
 	}
 
-	old_len = old_pin ? strlen(old_pin) : 0;
-	new_len = new_pin ? strlen(new_pin) : 0;
+	old_len = old_pin ? (int) strlen(old_pin) : 0;
+	new_len = new_pin ? (int) strlen(new_pin) : 0;
 	rv = CRYPTOKI_call(ctx,
 		C_SetPIN(priv->session, (CK_UTF8CHAR *) old_pin, old_len,
 			(CK_UTF8CHAR *) new_pin, new_len));

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git