1berry/openssl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

engines: Silence warnings on Win64 builds

Browse Source 
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27806)
This commit is contained in:
Tomas Mraz 2025-06-17 19:37:05 +02:00
parent abdbad370c
commit a0fcbcb282
3 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
engines/e_loader_attic.c
View File

@ -71,7 +71,7 @@ static char *file_get_pass(const UI_METHOD *ui_method, char *pass,
ATTICerr(0, ERR_R_UI_LIB); ATTICerr(0, ERR_R_UI_LIB);
pass = NULL; pass = NULL;
} else if (UI_add_input_string(ui, prompt, UI_INPUT_FLAG_DEFAULT_PWD, } else if (UI_add_input_string(ui, prompt, UI_INPUT_FLAG_DEFAULT_PWD,
pass, 0, maxsize - 1) <= 0) { pass, 0, (int)(maxsize - 1)) <= 0) {
ATTICerr(0, ERR_R_UI_LIB); ATTICerr(0, ERR_R_UI_LIB);
pass = NULL; pass = NULL;
} else { } else {
@ -122,7 +122,7 @@ static int file_get_pem_pass(char *buf, int num, int w, void *data)
pass_data->prompt_desc, pass_data->prompt_info, pass_data->prompt_desc, pass_data->prompt_info,
pass_data->data); pass_data->data);
return pass == NULL ? 0 : strlen(pass); return pass == NULL ? 0 : (int)strlen(pass);
} }
/* /*
@ -133,8 +133,8 @@ static int file_get_pem_pass(char *buf, int num, int w, void *data)
*/ */
static int check_suffix(const char *str, const char *suffix) static int check_suffix(const char *str, const char *suffix)
{ {
int str_len = strlen(str); int str_len = (int)strlen(str);
int suffix_len = strlen(suffix) + 1; int suffix_len = (int)(strlen(suffix) + 1);
const char *p = NULL; const char *p = NULL;
if (suffix_len >= str_len) if (suffix_len >= str_len)
@ -143,7 +143,7 @@ static int check_suffix(const char *str, const char *suffix)
if (*p != ' ' if (*p != ' '
|| strcmp(p + 1, suffix) != 0) || strcmp(p + 1, suffix) != 0)
return -1; return -1;
return p - str; return (int)(p - str);
} }
/* /*
@ -307,11 +307,11 @@ static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name,
/* Initial parsing */ /* Initial parsing */
PKCS12 *p12; PKCS12 *p12;
if (pem_name != NULL) if (pem_name != NULL || len > LONG_MAX)
/* No match, there is no PEM PKCS12 tag */ /* No match, there is no PEM PKCS12 tag */
return NULL; return NULL;
if ((p12 = d2i_PKCS12(NULL, &blob, len)) != NULL) { if ((p12 = d2i_PKCS12(NULL, &blob, (long)len)) != NULL) {
char *pass = NULL; char *pass = NULL;
char tpass[PEM_BUFSIZE]; char tpass[PEM_BUFSIZE];
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
@ -331,7 +331,7 @@ static OSSL_STORE_INFO *try_decode_PKCS12(const char *pem_name,
ATTICerr(0, ATTIC_R_PASSPHRASE_CALLBACK_ERROR); ATTICerr(0, ATTIC_R_PASSPHRASE_CALLBACK_ERROR);
goto p12_end; goto p12_end;
} }
if (!PKCS12_verify_mac(p12, pass, strlen(pass))) { if (!PKCS12_verify_mac(p12, pass, (int)strlen(pass))) {
ATTICerr(0, ATTIC_R_ERROR_VERIFYING_PKCS12_MAC); ATTICerr(0, ATTIC_R_ERROR_VERIFYING_PKCS12_MAC);
goto p12_end; goto p12_end;
} }
@ -452,7 +452,7 @@ static OSSL_STORE_INFO *try_decode_PKCS8Encrypted(const char *pem_name,
*matchcount = 1; *matchcount = 1;
} }
if ((p8 = d2i_X509_SIG(NULL, &blob, len)) == NULL) if (len > LONG_MAX || (p8 = d2i_X509_SIG(NULL, &blob, (long)len)) == NULL)
return NULL; return NULL;
*matchcount = 1; *matchcount = 1;
@ -470,7 +470,8 @@ static OSSL_STORE_INFO *try_decode_PKCS8Encrypted(const char *pem_name,
} }
X509_SIG_get0(p8, &dalg, &doct); X509_SIG_get0(p8, &dalg, &doct);
if (!PKCS12_pbe_crypt(dalg, pass, strlen(pass), doct->data, doct->length, if (!PKCS12_pbe_crypt(dalg, pass, (int)strlen(pass),
doct->data, doct->length,
&new_data, &new_data_len, 0)) &new_data, &new_data_len, 0))
goto nop8; goto nop8;
@ -516,10 +517,12 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
const EVP_PKEY_ASN1_METHOD *ameth = NULL; const EVP_PKEY_ASN1_METHOD *ameth = NULL;
if (len > LONG_MAX)
return NULL;
if (pem_name != NULL) { if (pem_name != NULL) {
if (strcmp(pem_name, PEM_STRING_PKCS8INF) == 0) { if (strcmp(pem_name, PEM_STRING_PKCS8INF) == 0) {
PKCS8_PRIV_KEY_INFO *p8inf = PKCS8_PRIV_KEY_INFO *p8inf =
d2i_PKCS8_PRIV_KEY_INFO(NULL, &blob, len); d2i_PKCS8_PRIV_KEY_INFO(NULL, &blob, (long)len);
*matchcount = 1; *matchcount = 1;
if (p8inf != NULL) if (p8inf != NULL)
@ -535,7 +538,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
&& EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
ameth)) { ameth)) {
*matchcount = 1; *matchcount = 1;
pkey = d2i_PrivateKey_ex(pkey_id, NULL, &blob, len, pkey = d2i_PrivateKey_ex(pkey_id, NULL, &blob, (long)len,
libctx, propq); libctx, propq);
} }
} }
@ -567,7 +570,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
ERR_set_mark(); /* prevent flooding error queue */ ERR_set_mark(); /* prevent flooding error queue */
tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL, tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL,
&tmp_blob, len, &tmp_blob, (long)len,
libctx, propq); libctx, propq);
if (tmp_pkey != NULL) { if (tmp_pkey != NULL) {
if (pkey != NULL) if (pkey != NULL)
@ -595,7 +598,7 @@ static OSSL_STORE_INFO *try_decode_PrivateKey(const char *pem_name,
continue; continue;
ERR_set_mark(); /* prevent flooding error queue */ ERR_set_mark(); /* prevent flooding error queue */
tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL, &tmp_blob, len, tmp_pkey = d2i_PrivateKey_ex(pkey_id, NULL, &tmp_blob, (long)len,
libctx, propq); libctx, propq);
if (tmp_pkey != NULL) { if (tmp_pkey != NULL) {
if (pkey != NULL) if (pkey != NULL)
@ -651,7 +654,7 @@ static OSSL_STORE_INFO *try_decode_PUBKEY(const char *pem_name,
*matchcount = 1; *matchcount = 1;
} }
if ((pkey = d2i_PUBKEY(NULL, &blob, len)) != NULL) { if (len > LONG_MAX || (pkey = d2i_PUBKEY(NULL, &blob, (long)len)) != NULL) {
*matchcount = 1; *matchcount = 1;
store_info = OSSL_STORE_INFO_new_PUBKEY(pkey); store_info = OSSL_STORE_INFO_new_PUBKEY(pkey);
} }
@ -681,6 +684,8 @@ static OSSL_STORE_INFO *try_decode_params(const char *pem_name,
EVP_PKEY *pkey = NULL; EVP_PKEY *pkey = NULL;
const EVP_PKEY_ASN1_METHOD *ameth = NULL; const EVP_PKEY_ASN1_METHOD *ameth = NULL;
if (len > LONG_MAX)
return NULL;
if (pem_name != NULL) { if (pem_name != NULL) {
int slen; int slen;
int pkey_id; int pkey_id;
@ -690,7 +695,7 @@ static OSSL_STORE_INFO *try_decode_params(const char *pem_name,
&& EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, && EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL,
ameth)) { ameth)) {
*matchcount = 1; *matchcount = 1;
pkey = d2i_KeyParams(pkey_id, NULL, &blob, len); pkey = d2i_KeyParams(pkey_id, NULL, &blob, (long)len);
} }
} else { } else {
int i; int i;
@ -708,7 +713,7 @@ static OSSL_STORE_INFO *try_decode_params(const char *pem_name,
ERR_set_mark(); /* prevent flooding error queue */ ERR_set_mark(); /* prevent flooding error queue */
tmp_pkey = d2i_KeyParams(pkey_id, NULL, &tmp_blob, len); tmp_pkey = d2i_KeyParams(pkey_id, NULL, &tmp_blob, (long)len);
if (tmp_pkey != NULL) { if (tmp_pkey != NULL) {
if (pkey != NULL) if (pkey != NULL)
@ -767,6 +772,8 @@ static OSSL_STORE_INFO *try_decode_X509Certificate(const char *pem_name,
*/ */
int ignore_trusted = 1; int ignore_trusted = 1;
if (len > LONG_MAX)
return NULL;
if (pem_name != NULL) { if (pem_name != NULL) {
if (strcmp(pem_name, PEM_STRING_X509_TRUSTED) == 0) if (strcmp(pem_name, PEM_STRING_X509_TRUSTED) == 0)
ignore_trusted = 0; ignore_trusted = 0;
@ -781,8 +788,8 @@ static OSSL_STORE_INFO *try_decode_X509Certificate(const char *pem_name,
if (cert == NULL) if (cert == NULL)
return NULL; return NULL;
if ((d2i_X509_AUX(&cert, &blob, len)) != NULL if ((d2i_X509_AUX(&cert, &blob, (long)len)) != NULL
|| (ignore_trusted && (d2i_X509(&cert, &blob, len)) != NULL)) { || (ignore_trusted && (d2i_X509(&cert, &blob, (long)len)) != NULL)) {
*matchcount = 1; *matchcount = 1;
store_info = OSSL_STORE_INFO_new_CERT(cert); store_info = OSSL_STORE_INFO_new_CERT(cert);
} }
@ -814,6 +821,8 @@ static OSSL_STORE_INFO *try_decode_X509CRL(const char *pem_name,
OSSL_STORE_INFO *store_info = NULL; OSSL_STORE_INFO *store_info = NULL;
X509_CRL *crl = NULL; X509_CRL *crl = NULL;
if (len > LONG_MAX)
return NULL;
if (pem_name != NULL) { if (pem_name != NULL) {
if (strcmp(pem_name, PEM_STRING_X509_CRL) != 0) if (strcmp(pem_name, PEM_STRING_X509_CRL) != 0)
/* No match */ /* No match */
@ -821,7 +830,7 @@ static OSSL_STORE_INFO *try_decode_X509CRL(const char *pem_name,
*matchcount = 1; *matchcount = 1;
} }
if ((crl = d2i_X509_CRL(NULL, &blob, len)) != NULL) { if ((crl = d2i_X509_CRL(NULL, &blob, (long)len)) != NULL) {
*matchcount = 1; *matchcount = 1;
store_info = OSSL_STORE_INFO_new_CRL(crl); store_info = OSSL_STORE_INFO_new_CRL(crl);
} }
@ -1404,8 +1413,8 @@ static int file_name_to_uri(OSSL_STORE_LOADER_CTX *ctx, const char *name,
assert(data != NULL); assert(data != NULL);
{ {
const char *pathsep = ossl_ends_with_dirsep(ctx->uri) ? "" : "/"; const char *pathsep = ossl_ends_with_dirsep(ctx->uri) ? "" : "/";
long calculated_length = strlen(ctx->uri) + strlen(pathsep) long calculated_length = (long)(strlen(ctx->uri) + strlen(pathsep)
+ strlen(name) + 1 /* \0 */; + strlen(name) + 1 /* \0 */);
*data = OPENSSL_zalloc(calculated_length); *data = OPENSSL_zalloc(calculated_length);
if (*data == NULL) if (*data == NULL)

6
engines/e_ossltest.c
View File

@ -749,7 +749,7 @@ static int ossltest_aes128_gcm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
memcpy(out, tmpbuf, inl); memcpy(out, tmpbuf, inl);
OPENSSL_free(tmpbuf); OPENSSL_free(tmpbuf);
return inl; return (int)inl;
} }
static int ossltest_aes128_gcm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, static int ossltest_aes128_gcm_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,
@ -817,7 +817,7 @@ static int ossltest_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
/* pad the payload|hmac */ /* pad the payload|hmac */
plen += SHA_DIGEST_LENGTH; plen += SHA_DIGEST_LENGTH;
for (l = len - plen - 1; plen < len; plen++) for (l = (unsigned int)(len - plen - 1); plen < len; plen++)
out[plen] = l; out[plen] = l;
} }
} else { } else {
@ -840,7 +840,7 @@ static int ossltest_aes128_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx,
/* figure out payload length */ /* figure out payload length */
pad = out[len - 1]; pad = out[len - 1];
maxpad = len - (SHA_DIGEST_LENGTH + 1); maxpad = (unsigned int)(len - (SHA_DIGEST_LENGTH + 1));
if (pad > maxpad) if (pad > maxpad)
return 0; return 0;
for (plen = len - pad - 1; plen < len; plen++) for (plen = len - pad - 1; plen < len; plen++)

4
engines/e_padlock.c
View File

@ -373,7 +373,7 @@ padlock_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
out_arg += chunk; out_arg += chunk;
in_arg += chunk; in_arg += chunk;
EVP_CIPHER_CTX_set_num(ctx, nbytes); EVP_CIPHER_CTX_set_num(ctx, (int)nbytes);
if (cdata->cword.b.encdec) { if (cdata->cword.b.encdec) {
cdata->cword.b.encdec = 0; cdata->cword.b.encdec = 0;
padlock_reload_key(); padlock_reload_key();
@ -441,7 +441,7 @@ padlock_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
out_arg += chunk; out_arg += chunk;
in_arg += chunk; in_arg += chunk;
EVP_CIPHER_CTX_set_num(ctx, nbytes); EVP_CIPHER_CTX_set_num(ctx, (int)nbytes);
padlock_reload_key(); /* empirically found */ padlock_reload_key(); /* empirically found */
padlock_aes_block(ivp, ivp, cdata); padlock_aes_block(ivp, ivp, cdata);
padlock_reload_key(); /* empirically found */ padlock_reload_key(); /* empirically found */