Fix size_t conversion for OSX

Andras Fekete · Andras Fekete · commit 2704dbdec176 · 2024-12-12T15:12:40.000-05:00
diff --git a/src/wp_digests.c b/src/wp_digests.c
@@ -583,7 +583,7 @@ static int name##_final(CTX* ctx, unsigned char* out, size_t* outLen,          \
         ok = 0;                                                                \
     }                                                                          \
     if (ok) {                                                                  \
-        int rc = fin(&ctx->obj, out, ctx->outLen);                             \
+        int rc = fin(&ctx->obj, out, (word32)ctx->outLen);                     \
         if (rc != 0) {                                                         \
             ok = 0;                                                            \
         }                                                                      \
diff --git a/src/wp_ecx_exch.c b/src/wp_ecx_exch.c
@@ -230,7 +230,7 @@ static int wp_x25519_derive(wp_EcxCtx* ctx, unsigned char* secret,
     }
     else if (ok) {
         int rc;
-        word32 len = secSize;
+        word32 len = (word32)secSize;
         int i;
 
         rc = wc_curve25519_shared_secret(wp_ecx_get_key(ctx->key),
@@ -316,7 +316,7 @@ static int wp_x448_derive(wp_EcxCtx* ctx, unsigned char* secret,
     }
     else if (ok) {
         int rc;
-        word32 len = secSize;
+        word32 len = (word32)secSize;
 
         rc = wc_curve448_shared_secret(wp_ecx_get_key(ctx->key),
             wp_ecx_get_key(ctx->peer), secret, &len);
diff --git a/src/wp_ecx_kmgmt.c b/src/wp_ecx_kmgmt.c
@@ -404,7 +404,7 @@ static int wp_ecx_set_params(wp_Ecx* ecx, const OSSL_PARAM params[])
         ok = 0;
     }
     if (ok && (data != NULL)) {
-        int rc = (*ecx->data->importPub)(data, len, (void*)&ecx->key,
+        int rc = (*ecx->data->importPub)(data, (word32)len, (void*)&ecx->key,
             ECX_LITTLE_ENDIAN);
         if (rc != 0) {
             ok = 0;
@@ -479,7 +479,7 @@ static int wp_ecx_get_params_enc_pub_key(wp_Ecx* ecx, OSSL_PARAM params[],
 
     p = OSSL_PARAM_locate(params, key);
     if (p != NULL) {
-        word32 outLen = p->return_size;
+        word32 outLen = (word32)p->return_size;
 
         if (p->data == NULL) {
             outLen = ecx->data->len;
@@ -513,7 +513,7 @@ static int wp_ecx_get_params_priv_key(wp_Ecx* ecx, OSSL_PARAM params[])
 
     p = OSSL_PARAM_locate(params, OSSL_PKEY_PARAM_PRIV_KEY);
     if (p != NULL) {
-        word32 outLen = p->return_size;
+        word32 outLen = (word32)p->return_size;
 
         if (p->data == NULL) {
             outLen = ecx->data->len;
@@ -869,7 +869,7 @@ static int wp_ecx_import(wp_Ecx* ecx, int selection, const OSSL_PARAM params[])
         if (ok && (privData != NULL)) {
             ecx->unclamped[0] = privData[0];
             ecx->unclamped[1] = privData[len - 1];
-            rc = (*ecx->data->importPriv)(privData, len, (void*)&ecx->key,
+            rc = (*ecx->data->importPriv)(privData, (word32)len, (void*)&ecx->key,
                 ECX_LITTLE_ENDIAN);
             if (rc != 0) {
                 ok = 0;
@@ -886,7 +886,7 @@ static int wp_ecx_import(wp_Ecx* ecx, int selection, const OSSL_PARAM params[])
             ok = 0;
         }
         if (ok && (pubData != NULL)) {
-            rc = (*ecx->data->importPub)(pubData, len, (void*)&ecx->key,
+            rc = (*ecx->data->importPub)(pubData, (word32)len, (void*)&ecx->key,
                 ECX_LITTLE_ENDIAN);
             if (rc != 0) {
                 ok = 0;
@@ -2034,7 +2034,7 @@ static int wp_ecx_encode(wp_EcxEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
         keyLen = derLen;
     }
     else if (ok && (ctx->encoding == WP_FORMAT_PEM)) {
-        rc = wc_DerToPemEx(derData, derLen, NULL, 0, cipherInfo, pemType);
+        rc = wc_DerToPemEx(derData, (word32)derLen, NULL, 0, cipherInfo, pemType);
         if (rc <= 0) {
             ok = 0;
         }
@@ -2046,7 +2046,7 @@ static int wp_ecx_encode(wp_EcxEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
             }
         }
         if (ok) {
-            rc = wc_DerToPemEx(derData, derLen, pemData, pemLen, cipherInfo,
+            rc = wc_DerToPemEx(derData, (word32)derLen, pemData, (word32)pemLen, cipherInfo,
                 pemType);
             if (rc <= 0) {
                 ok = 0;
@@ -2058,7 +2058,7 @@ static int wp_ecx_encode(wp_EcxEncDecCtx* ctx, OSSL_CORE_BIO *cBio,
         }
     }
     if (ok) {
-        rc = BIO_write(out, keyData, keyLen);
+        rc = BIO_write(out, keyData, (int)keyLen);
         if (rc <= 0) {
             ok = 0;
         }
diff --git a/src/wp_ecx_sig.c b/src/wp_ecx_sig.c
@@ -362,7 +362,7 @@ static int wp_ed25519_digest_sign(wp_EcxSigCtx *ctx, unsigned char *sig,
         if (sigSize == (size_t)-1) {
             sigSize = *sigLen;
         }
-        len = sigSize;
+        len = (word32)sigSize;
 
         if (!ed25519->pubKeySet) {
             unsigned char pubKey[ED25519_PUB_KEY_SIZE];
@@ -379,7 +379,7 @@ static int wp_ed25519_digest_sign(wp_EcxSigCtx *ctx, unsigned char *sig,
             }
         }
         if (ok) {
-            rc = wc_ed25519_sign_msg(tbs, tbsLen, sig, &len, ed25519);
+            rc = wc_ed25519_sign_msg(tbs, (word32)tbsLen, sig, &len, ed25519);
             if (rc != 0) {
                 ok = 0;
             }
@@ -434,8 +434,8 @@ static int wp_ed25519_digest_verify(wp_EcxSigCtx *ctx, unsigned char *sig,
     }
     if (ok) {
         int res;
-        int rc = wc_ed25519_verify_msg(sig, sigLen, tbs, tbsLen, &res,
-            wp_ecx_get_key(ctx->ecx));
+        int rc = wc_ed25519_verify_msg(sig, (word32)sigLen, tbs, (word32)tbsLen,
+                &res, wp_ecx_get_key(ctx->ecx));
         if (rc != 0) {
             ok = 0;
         }
@@ -504,7 +504,7 @@ static int wp_ed448_digest_sign(wp_EcxSigCtx *ctx, unsigned char *sig,
         if (sigSize == (size_t)-1) {
             sigSize = *sigLen;
         }
-        len = sigSize;
+        len = (word32)sigSize;
 
         if (!ed448->pubKeySet) {
             unsigned char pubKey[ED448_PUB_KEY_SIZE];
@@ -521,7 +521,7 @@ static int wp_ed448_digest_sign(wp_EcxSigCtx *ctx, unsigned char *sig,
             }
         }
         if (ok) {
-            rc = wc_ed448_sign_msg(tbs, tbsLen, sig, &len,
+            rc = wc_ed448_sign_msg(tbs, (word32)tbsLen, sig, &len,
                 (ed448_key*)wp_ecx_get_key(ctx->ecx), NULL, 0);
             if (rc != 0) {
                 ok = 0;
@@ -582,8 +582,8 @@ static int wp_ed448_digest_verify(wp_EcxSigCtx *ctx, unsigned char *sig,
     }
     if (ok) {
         int res;
-        int rc = wc_ed448_verify_msg(sig, sigLen, tbs, tbsLen, &res,
-            wp_ecx_get_key(ctx->ecx), NULL, 0);
+        int rc = wc_ed448_verify_msg(sig, (word32)sigLen, tbs, (word32)tbsLen,
+                &res, wp_ecx_get_key(ctx->ecx), NULL, 0);
         if (rc != 0) {
             ok = 0;
         }

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ static int wp_ed25519_digest_sign(wp_EcxSigCtx ctx, unsigned char sig,`
`362`	`362`	`if (sigSize == (size_t)-1) {`
`363`	`363`	`sigSize = *sigLen;`
`364`	`364`	`}`
`365`		`- len = sigSize;`
	`365`	`+ len = (word32)sigSize;`
`366`	`366`
`367`	`367`	`if (!ed25519->pubKeySet) {`
`368`	`368`	`unsigned char pubKey[ED25519_PUB_KEY_SIZE];`
`@@ -379,7 +379,7 @@ static int wp_ed25519_digest_sign(wp_EcxSigCtx ctx, unsigned char sig,`
`379`	`379`	`}`
`380`	`380`	`}`
`381`	`381`	`if (ok) {`
`382`		`- rc = wc_ed25519_sign_msg(tbs, tbsLen, sig, &len, ed25519);`
	`382`	`+ rc = wc_ed25519_sign_msg(tbs, (word32)tbsLen, sig, &len, ed25519);`
`383`	`383`	`if (rc != 0) {`
`384`	`384`	`ok = 0;`
`385`	`385`	`}`
`@@ -434,8 +434,8 @@ static int wp_ed25519_digest_verify(wp_EcxSigCtx ctx, unsigned char sig,`
`434`	`434`	`}`
`435`	`435`	`if (ok) {`
`436`	`436`	`int res;`
`437`		`- int rc = wc_ed25519_verify_msg(sig, sigLen, tbs, tbsLen, &res,`
`438`		`- wp_ecx_get_key(ctx->ecx));`
	`437`	`+ int rc = wc_ed25519_verify_msg(sig, (word32)sigLen, tbs, (word32)tbsLen,`
	`438`	`+ &res, wp_ecx_get_key(ctx->ecx));`
`439`	`439`	`if (rc != 0) {`
`440`	`440`	`ok = 0;`
`441`	`441`	`}`
`@@ -504,7 +504,7 @@ static int wp_ed448_digest_sign(wp_EcxSigCtx ctx, unsigned char sig,`
`504`	`504`	`if (sigSize == (size_t)-1) {`
`505`	`505`	`sigSize = *sigLen;`
`506`	`506`	`}`
`507`		`- len = sigSize;`
	`507`	`+ len = (word32)sigSize;`
`508`	`508`
`509`	`509`	`if (!ed448->pubKeySet) {`
`510`	`510`	`unsigned char pubKey[ED448_PUB_KEY_SIZE];`
`@@ -521,7 +521,7 @@ static int wp_ed448_digest_sign(wp_EcxSigCtx ctx, unsigned char sig,`
`521`	`521`	`}`
`522`	`522`	`}`
`523`	`523`	`if (ok) {`
`524`		`- rc = wc_ed448_sign_msg(tbs, tbsLen, sig, &len,`
	`524`	`+ rc = wc_ed448_sign_msg(tbs, (word32)tbsLen, sig, &len,`
`525`	`525`	`(ed448_key*)wp_ecx_get_key(ctx->ecx), NULL, 0);`
`526`	`526`	`if (rc != 0) {`
`527`	`527`	`ok = 0;`
`@@ -582,8 +582,8 @@ static int wp_ed448_digest_verify(wp_EcxSigCtx ctx, unsigned char sig,`
`582`	`582`	`}`
`583`	`583`	`if (ok) {`
`584`	`584`	`int res;`
`585`		`- int rc = wc_ed448_verify_msg(sig, sigLen, tbs, tbsLen, &res,`
`586`		`- wp_ecx_get_key(ctx->ecx), NULL, 0);`
	`585`	`+ int rc = wc_ed448_verify_msg(sig, (word32)sigLen, tbs, (word32)tbsLen,`
	`586`	`+ &res, wp_ecx_get_key(ctx->ecx), NULL, 0);`
`587`	`587`	`if (rc != 0) {`
`588`	`588`	`ok = 0;`
`589`	`589`	`}`