Squash compiler warnings on Windows (MSVC)

olszomal · mtrojnar · commit fae023166bf6 · 2025-02-12T14:50:12.000+01:00
diff --git a/src/eng_front.c b/src/eng_front.c
@@ -220,7 +220,7 @@ static EVP_PKEY *load_privkey(ENGINE *engine, const char *s_key_id,
 	return pkey;
 }
 
-static int engine_ctrl(ENGINE *engine, int cmd, long i, void *p, void (*f) ())
+static int engine_ctrl(ENGINE *engine, int cmd, long i, void *p, void (*f) (void))
 {
 	ENGINE_CTX *ctx;
 
diff --git a/src/p11_attr.c b/src/p11_attr.c
@@ -42,7 +42,7 @@ int pkcs11_getattr_var(PKCS11_CTX_private *ctx, CK_SESSION_HANDLE session,
 
 	templ.type = type;
 	templ.pValue = value;
-	templ.ulValueLen = *size;
+	templ.ulValueLen = (CK_ULONG)*size;
 	rv = CRYPTOKI_call(ctx, C_GetAttributeValue(session, object, &templ, 1));
 	CRYPTOKI_checkerr(CKR_F_PKCS11_GETATTR_INT, rv);
 	*size = templ.ulValueLen;
@@ -117,7 +117,7 @@ unsigned int pkcs11_addattr(PKCS11_TEMPLATE *tmpl, int type, void *data, size_t
 	ap = &tmpl->attrs[tmpl->nattr++];
 	ap->type = type;
 	ap->pValue = data;
-	ap->ulValueLen = size;
+	ap->ulValueLen = (CK_ULONG)size;
 	return n;
 }
 
diff --git a/src/p11_ec.c b/src/p11_ec.c
@@ -558,7 +558,7 @@ static CK_ECDH1_DERIVE_PARAMS *pkcs11_ecdh_params_alloc(
 	parms->pSharedData = NULL;
 	parms->ulSharedDataLen = 0;
 	parms->pPublicData = buf;
-	parms->ulPublicDataLen = len;
+	parms->ulPublicDataLen = (CK_ULONG)len;
 	return parms;
 }
 
diff --git a/src/p11_front.c b/src/p11_front.c
@@ -148,7 +148,7 @@ PKCS11_SLOT *PKCS11_find_next_token(PKCS11_CTX *ctx,
 		return NULL;
 
 	if (current) {
-		offset = current + 1 - slots;
+		offset = (int)(current + 1 - slots);
 		if (offset < 1 || (unsigned int)offset >= nslots)
 			return NULL;
 	} else {
diff --git a/src/p11_key.c b/src/p11_key.c
@@ -609,7 +609,7 @@ int pkcs11_authenticate(PKCS11_OBJECT_private *key, CK_SESSION_HANDLE session)
 	/* Login with the PIN */
 	rv = CRYPTOKI_call(ctx,
 		C_Login(session, CKU_CONTEXT_SPECIFIC,
-			(CK_UTF8CHAR *)pin, strlen(pin)));
+			(CK_UTF8CHAR *)pin, (CK_ULONG)strlen(pin)));
 	OPENSSL_cleanse(pin, MAX_PIN_LENGTH+1);
 	OPENSSL_free(pin);
 	return rv == CKR_USER_ALREADY_LOGGED_IN ? 0 : rv;
diff --git a/src/p11_pkey.c b/src/p11_pkey.c
@@ -274,7 +274,7 @@ static int pkcs11_try_pkey_rsa_sign(EVP_PKEY_CTX *evp_pkey_ctx,
 	EVP_PKEY *pkey;
 	RSA *rsa;
 	int rv = 0, padding;
-	CK_ULONG size = *siglen;
+	CK_ULONG size = (CK_ULONG)*siglen;
 	PKCS11_OBJECT_private *key;
 	PKCS11_SLOT_private *slot;
 	PKCS11_CTX_private *ctx;
@@ -345,7 +345,7 @@ static int pkcs11_try_pkey_rsa_sign(EVP_PKEY_CTX *evp_pkey_ctx,
 		rv = pkcs11_authenticate(key, session);
 	if (rv == CKR_OK) {
 		rv = CRYPTOKI_call(ctx,
-			C_Sign(session, (CK_BYTE_PTR)tbs, tbslen, sig, &size));
+			C_Sign(session, (CK_BYTE_PTR)tbs, (CK_ULONG)tbslen, sig, &size));
 		if (rv != CKR_OK) {
 			pkcs11_log(ctx, LOG_DEBUG, "%s:%d C_Sign rv=%d\n",
 				__FILE__, __LINE__, rv);
@@ -378,7 +378,7 @@ static int pkcs11_try_pkey_rsa_decrypt(EVP_PKEY_CTX *evp_pkey_ctx,
 	EVP_PKEY *pkey;
 	RSA *rsa;
 	int rv = 0, padding;
-	CK_ULONG size = *outlen;
+	CK_ULONG size = (CK_ULONG)*outlen;
 	PKCS11_OBJECT_private *key;
 	PKCS11_SLOT_private *slot;
 	PKCS11_CTX_private *ctx;
@@ -450,7 +450,7 @@ static int pkcs11_try_pkey_rsa_decrypt(EVP_PKEY_CTX *evp_pkey_ctx,
 		rv = pkcs11_authenticate(key, session);
 	if (rv == CKR_OK) {
 		rv = CRYPTOKI_call(ctx,
-			C_Decrypt(session, (CK_BYTE_PTR)in, inlen, out, &size));
+			C_Decrypt(session, (CK_BYTE_PTR)in, (CK_ULONG)inlen, out, &size));
 		if (rv != CKR_OK) {
 			pkcs11_log(ctx, LOG_DEBUG, "%s:%d C_Decrypt rv=%d\n",
 				__FILE__, __LINE__, rv);
@@ -509,7 +509,7 @@ static int pkcs11_try_pkey_ec_sign(EVP_PKEY_CTX *evp_pkey_ctx,
 	EVP_PKEY *pkey;
 	EC_KEY *eckey;
 	int rv = CKR_GENERAL_ERROR;
-	CK_ULONG size = *siglen;
+	CK_ULONG size = (CK_ULONG)*siglen;
 	PKCS11_OBJECT_private *key;
 	PKCS11_SLOT_private *slot;
 	PKCS11_CTX_private *ctx;
@@ -575,7 +575,7 @@ static int pkcs11_try_pkey_ec_sign(EVP_PKEY_CTX *evp_pkey_ctx,
 		rv = pkcs11_authenticate(key, session);
 	if (rv == CKR_OK) {
 		rv = CRYPTOKI_call(ctx,
-			C_Sign(session, (CK_BYTE_PTR)tbs, tbslen, sig, &size));
+			C_Sign(session, (CK_BYTE_PTR)tbs, (CK_ULONG)tbslen, sig, &size));
 		if (rv != CKR_OK) {
 			pkcs11_log(ctx, LOG_DEBUG, "%s:%d C_Sign rv=%d\n",
 				__FILE__, __LINE__, rv);
diff --git a/src/util_uri.c b/src/util_uri.c
@@ -238,7 +238,7 @@ static char *dump_expiry(const PKCS11_CERT *cert)
 	int len = 0;
 
 	if (!cert || !cert->x509 || !(exp = X509_get0_notAfter(cert->x509)))
-		return strdup("No expiry information available");
+		return OPENSSL_strdup("No expiry information available");
 
 	if ((bio = BIO_new(BIO_s_mem())) == NULL)
 		return NULL; /* Memory allocation failure */
@@ -414,7 +414,8 @@ static int parse_slot_id_string(UTIL_CTX *ctx,
 		const char *slot_id, int *slot,
 		char *id, size_t *id_len, char **label)
 {
-	int n, i;
+	int n;
+	size_t i;
 
 	/* support for several formats */
 #define HEXDIGITS "01234567890ABCDEFabcdef"
@@ -613,7 +614,7 @@ static int read_from_file(UTIL_CTX *ctx,
 		BIO_free(fp);
 		return 0;
 	}
-	if (BIO_gets(fp, txt, *field_len + 1) > 0) {
+	if (BIO_gets(fp, txt, (int)*field_len + 1) > 0) {
 		memcpy(field, txt, *field_len);
 		*field_len = strlen(txt);
 	} else {
@@ -676,30 +677,30 @@ static int parse_pkcs11_uri(UTIL_CTX *ctx,
 
 		if (!strncmp(p, "model=", 6)) {
 			p += 6;
-			rv = parse_uri_attr(ctx, p, end - p, &tok->model);
+			rv = parse_uri_attr(ctx, p, (int)(end - p), &tok->model);
 		} else if (!strncmp(p, "manufacturer=", 13)) {
 			p += 13;
-			rv = parse_uri_attr(ctx, p, end - p, &tok->manufacturer);
+			rv = parse_uri_attr(ctx, p, (int)(end - p), &tok->manufacturer);
 		} else if (!strncmp(p, "token=", 6)) {
 			p += 6;
-			rv = parse_uri_attr(ctx, p, end - p, &tok->label);
+			rv = parse_uri_attr(ctx, p, (int)(end - p), &tok->label);
 		} else if (!strncmp(p, "serial=", 7)) {
 			p += 7;
-			rv = parse_uri_attr(ctx, p, end - p, &tok->serialnr);
+			rv = parse_uri_attr(ctx, p, (int)(end - p), &tok->serialnr);
 		} else if (!strncmp(p, "object=", 7)) {
 			p += 7;
-			rv = parse_uri_attr(ctx, p, end - p, &newlabel);
+			rv = parse_uri_attr(ctx, p, (int)(end - p), &newlabel);
 		} else if (!strncmp(p, "id=", 3)) {
 			p += 3;
-			rv = parse_uri_attr_len(ctx, p, end - p, id, id_len);
+			rv = parse_uri_attr_len(ctx, p, (int)(end - p), id, id_len);
 			id_set = 1;
 		} else if (!strncmp(p, "pin-value=", 10)) {
 			p += 10;
-			rv = pin_set ? 0 : parse_uri_attr_len(ctx, p, end - p, pin, pin_len);
+			rv = pin_set ? 0 : parse_uri_attr_len(ctx, p, (int)(end - p), pin, pin_len);
 			pin_set = 1;
 		} else if (!strncmp(p, "pin-source=", 11)) {
 			p += 11;
-			rv = pin_set ? 0 : parse_pin_source(ctx, p, end - p, pin, pin_len);
+			rv = pin_set ? 0 : parse_pin_source(ctx, p, (int)(end - p), pin, pin_len);
 			pin_set = 1;
 		} else if (!strncmp(p, "type=", 5) || !strncmp(p, "object-type=", 12)) {
 			p = strchr(p, '=') + 1;
@@ -840,7 +841,7 @@ static void *UTIL_CTX_try_load_object(UTIL_CTX *ctx,
 		} else {
 			strcpy(flags, "no token, ");
 		}
-		if ((m = strlen(flags)) != 0) {
+		if ((m = (unsigned int)strlen(flags)) != 0) {
 			flags[m - 2] = '\0';
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ static EVP_PKEY load_privkey(ENGINE engine, const char *s_key_id,`
`220`	`220`	`return pkey;`
`221`	`221`	`}`
`222`	`222`
`223`		`-static int engine_ctrl(ENGINE engine, int cmd, long i, void p, void (*f) ())`
	`223`	`+static int engine_ctrl(ENGINE engine, int cmd, long i, void p, void (*f) (void))`
`224`	`224`	`{`
`225`	`225`	`ENGINE_CTX *ctx;`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ static CK_ECDH1_DERIVE_PARAMS *pkcs11_ecdh_params_alloc(`
`558`	`558`	`parms->pSharedData = NULL;`
`559`	`559`	`parms->ulSharedDataLen = 0;`
`560`	`560`	`parms->pPublicData = buf;`
`561`		`- parms->ulPublicDataLen = len;`
	`561`	`+ parms->ulPublicDataLen = (CK_ULONG)len;`
`562`	`562`	`return parms;`
`563`	`563`	`}`
`564`	`564`