From: Tomas Mraz Date: Thu, 19 Jun 2025 08:12:13 +0000 (+0200) Subject: demos: Silence warnings on Win64 builds X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8067e713a161adc18e47cf46bdaf9ced34bc63d0;p=thirdparty%2Fopenssl.git demos: Silence warnings on Win64 builds Reviewed-by: Saša Nedvědický Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/27806) --- diff --git a/demos/bio/sconnect.c b/demos/bio/sconnect.c index 1f4be4f635f..16ac2be573f 100644 --- a/demos/bio/sconnect.c +++ b/demos/bio/sconnect.c @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) out = BIO_push(ssl_bio, out); p = "GET / HTTP/1.0\r\n\r\n"; - len = strlen(p); + len = (int)strlen(p); off = 0; for (;;) { diff --git a/demos/cipher/aesccm.c b/demos/cipher/aesccm.c index 55d2b5fe6d2..ada55cca024 100644 --- a/demos/cipher/aesccm.c +++ b/demos/cipher/aesccm.c @@ -142,7 +142,7 @@ static int aes_ccm_encrypt(void) /* Output tag */ printf("Tag:\n"); - BIO_dump_fp(stdout, outtag, ccm_tag_len); + BIO_dump_fp(stdout, outtag, (int)ccm_tag_len); ret = 1; err: diff --git a/demos/digest/BIO_f_md.c b/demos/digest/BIO_f_md.c index 53b77a73155..f8157aafe48 100644 --- a/demos/digest/BIO_f_md.c +++ b/demos/digest/BIO_f_md.c @@ -27,6 +27,10 @@ #include #include +#ifdef OPENSSL_SYS_WINDOWS +# define fileno _fileno +#endif + /*- * This demonstration will show how to digest data using * a BIO configured with a message digest diff --git a/demos/encrypt/rsa_encrypt.c b/demos/encrypt/rsa_encrypt.c index d95b9855115..25d607ddbde 100644 --- a/demos/encrypt/rsa_encrypt.c +++ b/demos/encrypt/rsa_encrypt.c @@ -139,7 +139,7 @@ static int do_encrypt(OSSL_LIB_CTX *libctx, *out_len = buf_len; *out = buf; fprintf(stdout, "Encrypted:\n"); - BIO_dump_indent_fp(stdout, buf, buf_len, 2); + BIO_dump_indent_fp(stdout, buf, (int)buf_len, 2); fprintf(stdout, "\n"); ret = 1; @@ -198,7 +198,7 @@ static int do_decrypt(OSSL_LIB_CTX *libctx, const unsigned char *in, size_t in_l *out_len = buf_len; *out = buf; fprintf(stdout, "Decrypted:\n"); - BIO_dump_indent_fp(stdout, buf, buf_len, 2); + BIO_dump_indent_fp(stdout, buf, (int)buf_len, 2); fprintf(stdout, "\n"); ret = 1; diff --git a/demos/guide/quic-server-block.c b/demos/guide/quic-server-block.c index f9db25d276d..db9cc1f71ed 100644 --- a/demos/guide/quic-server-block.c +++ b/demos/guide/quic-server-block.c @@ -160,7 +160,7 @@ static int create_socket(uint16_t port) struct sockaddr_in sa = {0}; /* Retrieve the file descriptor for a new UDP socket */ - if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { + if ((fd = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { fprintf(stderr, "cannot create socket"); goto err; } diff --git a/demos/guide/quic-server-non-block.c b/demos/guide/quic-server-non-block.c index ee2bf5fb2bf..f8f42b4b207 100644 --- a/demos/guide/quic-server-non-block.c +++ b/demos/guide/quic-server-non-block.c @@ -160,7 +160,7 @@ static int create_socket(uint16_t port) struct sockaddr_in sa = {0}; /* Retrieve the file descriptor for a new UDP socket */ - if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { + if ((fd = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { fprintf(stderr, "cannot create socket"); return -1; } @@ -423,7 +423,7 @@ static int run_quic_server(SSL_CTX *ctx, int fd) } if (total_read != total_written) - fprintf(stderr, "Failed to echo data [read: %lu, written: %lu]\n", + fprintf(stderr, "Failed to echo data [read: %zu, written: %zu]\n", total_read, total_written); /* diff --git a/demos/kdf/argon2.c b/demos/kdf/argon2.c index 6c542d54edc..9581c12ccf9 100644 --- a/demos/kdf/argon2.c +++ b/demos/kdf/argon2.c @@ -113,7 +113,7 @@ int main(int argc, char **argv) if (max_threads == 0) threads = 1; else if (max_threads < parallel_cost) - threads = max_threads; + threads = (unsigned int)max_threads; } /* Set password */ diff --git a/demos/keyexch/x25519.c b/demos/keyexch/x25519.c index f0fb160a2fa..a09995b9a08 100644 --- a/demos/keyexch/x25519.c +++ b/demos/keyexch/x25519.c @@ -185,7 +185,7 @@ static int keyexch_x25519_after( } printf("Shared secret (%s):\n", local_peer->name); - BIO_dump_indent_fp(stdout, local_peer->secret, local_peer->secret_len, 2); + BIO_dump_indent_fp(stdout, local_peer->secret, (int)local_peer->secret_len, 2); putchar('\n'); ret = 1; diff --git a/demos/mac/cmac-aes256.c b/demos/mac/cmac-aes256.c index 64069cf3a82..aba9c806a6a 100644 --- a/demos/mac/cmac-aes256.c +++ b/demos/mac/cmac-aes256.c @@ -128,7 +128,7 @@ int main(void) } printf("Generated MAC:\n"); - BIO_dump_indent_fp(stdout, out, out_len, 2); + BIO_dump_indent_fp(stdout, out, (int)out_len, 2); putchar('\n'); if (out_len != sizeof(expected_output)) { diff --git a/demos/mac/gmac.c b/demos/mac/gmac.c index d4e350a2da6..7e7cc668ca7 100644 --- a/demos/mac/gmac.c +++ b/demos/mac/gmac.c @@ -121,7 +121,7 @@ int main(int argc, char **argv) } printf("Generated MAC:\n"); - BIO_dump_indent_fp(stdout, out, out_len, 2); + BIO_dump_indent_fp(stdout, out, (int)out_len, 2); putchar('\n'); if (out_len != sizeof(expected_output)) { diff --git a/demos/mac/hmac-sha512.c b/demos/mac/hmac-sha512.c index 47b5246a19a..f0048c635cb 100644 --- a/demos/mac/hmac-sha512.c +++ b/demos/mac/hmac-sha512.c @@ -139,7 +139,7 @@ int main(void) } printf("Generated MAC:\n"); - BIO_dump_indent_fp(stdout, out, out_len, 2); + BIO_dump_indent_fp(stdout, out, (int)out_len, 2); putchar('\n'); if (out_len != sizeof(expected_output)) { diff --git a/demos/mac/poly1305.c b/demos/mac/poly1305.c index 15c9c0097d9..45cd314ef57 100644 --- a/demos/mac/poly1305.c +++ b/demos/mac/poly1305.c @@ -183,7 +183,7 @@ int main(int argc, char **argv) } printf("Generated MAC:\n"); - BIO_dump_indent_fp(stdout, out, out_len, 2); + BIO_dump_indent_fp(stdout, out, (int)out_len, 2); putchar('\n'); if (out_len != sizeof(expected_output)) { diff --git a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c index ac7e7905f6f..70aef2bc493 100644 --- a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c +++ b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c @@ -120,7 +120,7 @@ int main(int argc, char **argv) * This example loads the PEM data from a memory buffer * Use BIO_new_fp() to load a PEM file instead */ - in = BIO_new_mem_buf(dsapem, strlen(dsapem)); + in = BIO_new_mem_buf(dsapem, (int)strlen(dsapem)); if (in == NULL) { fprintf(stderr, "BIO_new_mem_buf() failed\n"); goto cleanup; diff --git a/demos/pkey/EVP_PKEY_EC_keygen.c b/demos/pkey/EVP_PKEY_EC_keygen.c index 76c6217975e..27935665a1e 100644 --- a/demos/pkey/EVP_PKEY_EC_keygen.c +++ b/demos/pkey/EVP_PKEY_EC_keygen.c @@ -118,9 +118,9 @@ static int get_key_values(EVP_PKEY *pkey) fprintf(stdout, "Curve name: %s\n", out_curvename); fprintf(stdout, "Public key:\n"); - BIO_dump_indent_fp(stdout, out_pubkey, out_pubkey_len, 2); + BIO_dump_indent_fp(stdout, out_pubkey, (int)out_pubkey_len, 2); fprintf(stdout, "Private Key:\n"); - BIO_dump_indent_fp(stdout, out_privkey, out_privkey_len, 2); + BIO_dump_indent_fp(stdout, out_privkey, (int)out_privkey_len, 2); ret = 1; cleanup: diff --git a/demos/pkey/dsa.inc b/demos/pkey/dsa.inc index 82c65057eb2..5fb12fdb85d 100644 --- a/demos/pkey/dsa.inc +++ b/demos/pkey/dsa.inc @@ -129,7 +129,7 @@ static int dsa_print_key(const EVP_PKEY *pkey, int keypair, if (EVP_PKEY_get_octet_string_param(pkey, OSSL_PKEY_PARAM_FFC_SEED, seed, sizeof(seed), &seedlen) > 0) { BIO_printf(bio, " %s\n", OSSL_PKEY_PARAM_FFC_SEED); - BIO_dump(bio, seed, seedlen); + BIO_dump(bio, seed, (int)seedlen); } if (EVP_PKEY_get_int_param(pkey, OSSL_PKEY_PARAM_FFC_GINDEX, &gindex) > 0) { if (gindex != -1) diff --git a/demos/quic/poll-server/quic-server-ssl-poll-http.c b/demos/quic/poll-server/quic-server-ssl-poll-http.c index 747d00754f7..dd430c847b6 100644 --- a/demos/quic/poll-server/quic-server-ssl-poll-http.c +++ b/demos/quic/poll-server/quic-server-ssl-poll-http.c @@ -508,11 +508,11 @@ new_txt_simple_respoonse(const char *fill_pattern, unsigned int fsize) if (rts == NULL) return NULL; - if ((rts->rts_pattern = strdup(fill_pattern)) == NULL) { + if ((rts->rts_pattern = OPENSSL_strdup(fill_pattern)) == NULL) { OPENSSL_free(rts); return NULL; } - rts->rts_pattern_len = strlen(fill_pattern); + rts->rts_pattern_len = (unsigned int)strlen(fill_pattern); rts->rts_len = fsize; rb = (struct response_buffer *)rts; @@ -603,11 +603,11 @@ new_txt_full_respoonse(const char *fill_pattern, unsigned int fsize) if (rtf == NULL) return NULL; - if ((rtf->rtf_pattern = strdup(fill_pattern)) == NULL) { + if ((rtf->rtf_pattern = OPENSSL_strdup(fill_pattern)) == NULL) { OPENSSL_free(rtf); return NULL; } - rtf->rtf_pattern_len = strlen(fill_pattern); + rtf->rtf_pattern_len = (unsigned int)strlen(fill_pattern); t = time(&t); ctime_r(&t, date_str); @@ -1037,7 +1037,7 @@ rebuild_poll_set(struct poll_manager *pm) POLL_PRINTA(pe->pe_poll_item.events), POLL_PRINTA(~pe->pe_want_mask)); } - pm->pm_event_count = i; + pm->pm_event_count = (unsigned int)i; pm->pm_need_rebuild = 0; return 0; @@ -1456,7 +1456,7 @@ app_read_cb(struct poll_event *pe) return rv; } pes->pes_wpos += read_len; - pes->pes_wpos_sz -= read_len; + pes->pes_wpos_sz -= (unsigned int)read_len; rv = parse_request(pes); @@ -1869,7 +1869,7 @@ create_socket(uint16_t port) struct sockaddr_in sa = {0}; /* Retrieve the file descriptor for a new UDP socket */ - if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { + if ((fd = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { DPRINTF(stderr, "cannot create socket"); return -1; } diff --git a/demos/quic/server/server.c b/demos/quic/server/server.c index 6b26ab845a6..617d3db9c54 100644 --- a/demos/quic/server/server.c +++ b/demos/quic/server/server.c @@ -82,7 +82,7 @@ static int create_socket(uint16_t port) int fd = -1; struct sockaddr_in sa = {0}; - if ((fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { + if ((fd = (int)socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { fprintf(stderr, "cannot create socket"); goto err; } diff --git a/demos/signature/EVP_DSA_Signature_demo.c b/demos/signature/EVP_DSA_Signature_demo.c index de1efd2b490..ef70cd431e6 100644 --- a/demos/signature/EVP_DSA_Signature_demo.c +++ b/demos/signature/EVP_DSA_Signature_demo.c @@ -220,7 +220,7 @@ end: EVP_PKEY_CTX_free(pkey_ctx); fprintf(stdout, "Generating signature:\n"); - BIO_dump_indent_fp(stdout, sig_value, sig_len, 2); + BIO_dump_indent_fp(stdout, sig_value, (int)sig_len, 2); fprintf(stdout, "\n"); return ret; } diff --git a/demos/signature/EVP_EC_Signature_demo.c b/demos/signature/EVP_EC_Signature_demo.c index 9e4f8e45dad..e1086bb75c5 100644 --- a/demos/signature/EVP_EC_Signature_demo.c +++ b/demos/signature/EVP_EC_Signature_demo.c @@ -134,7 +134,7 @@ static int demo_sign(OSSL_LIB_CTX *libctx, const char *sig_name, *sig_out_len = sig_len; *sig_out_value = sig_value; fprintf(stdout, "Generating signature:\n"); - BIO_dump_indent_fp(stdout, sig_value, sig_len, 2); + BIO_dump_indent_fp(stdout, sig_value, (int)sig_len, 2); fprintf(stdout, "\n"); ret = 1; diff --git a/demos/signature/EVP_ED_Signature_demo.c b/demos/signature/EVP_ED_Signature_demo.c index e5cb6f4de15..007ecf288fa 100644 --- a/demos/signature/EVP_ED_Signature_demo.c +++ b/demos/signature/EVP_ED_Signature_demo.c @@ -73,7 +73,7 @@ static int demo_sign(EVP_PKEY *priv, } *sig_out_len = sig_len; *sig_out_value = sig_value; - BIO_dump_indent_fp(stdout, sig_value, sig_len, 2); + BIO_dump_indent_fp(stdout, sig_value, (int)sig_len, 2); fprintf(stdout, "\n"); ret = 1; diff --git a/demos/sslecho/main.c b/demos/sslecho/main.c index faa8b389551..a95f022c1d2 100644 --- a/demos/sslecho/main.c +++ b/demos/sslecho/main.c @@ -17,8 +17,13 @@ #include #include #include + +#define SOCKET int +#define closesocket(s) close(s) + #else #include +#include #endif static const int server_port = 4433; @@ -33,9 +38,9 @@ typedef unsigned char flag; */ static volatile flag server_running = true; -static int create_socket(flag isServer) +static SOCKET create_socket(flag isServer) { - int s; + SOCKET s; int optval = 1; struct sockaddr_in addr; @@ -51,7 +56,7 @@ static int create_socket(flag isServer) addr.sin_addr.s_addr = INADDR_ANY; /* Reuse the address; good for quick restarts */ - if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) + if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) < 0) { perror("setsockopt(SO_REUSEADDR) failed"); exit(EXIT_FAILURE); @@ -141,8 +146,8 @@ int main(int argc, char **argv) SSL_CTX *ssl_ctx = NULL; SSL *ssl = NULL; - int server_skt = -1; - int client_skt = -1; + SOCKET server_skt = -1; + SOCKET client_skt = -1; /* used by fgets */ char buffer[BUFFERSIZE]; @@ -207,7 +212,7 @@ int main(int argc, char **argv) while (server_running) { /* Wait for TCP connection from client */ client_skt = accept(server_skt, (struct sockaddr*) &addr, - &addr_len); + &addr_len); if (client_skt < 0) { perror("Unable to accept"); exit(EXIT_FAILURE); @@ -217,7 +222,7 @@ int main(int argc, char **argv) /* Create server SSL structure using newly accepted client socket */ ssl = SSL_new(ssl_ctx); - if (!SSL_set_fd(ssl, client_skt)) { + if (!SSL_set_fd(ssl, (int)client_skt)) { ERR_print_errors_fp(stderr); exit(EXIT_FAILURE); } @@ -233,7 +238,7 @@ int main(int argc, char **argv) /* Echo loop */ while (true) { /* Get message from client; will fail if client closes connection */ - if ((rxlen = SSL_read(ssl, rxbuf, rxcap)) <= 0) { + if ((rxlen = SSL_read(ssl, rxbuf, (int)rxcap)) <= 0) { if (rxlen == 0) { printf("Client closed connection\n"); } else { @@ -263,7 +268,7 @@ int main(int argc, char **argv) /* Cleanup for next client */ SSL_shutdown(ssl); SSL_free(ssl); - close(client_skt); + closesocket(client_skt); /* * Set client_skt to -1 to avoid double close when * server_running become false before next accept @@ -297,7 +302,7 @@ int main(int argc, char **argv) /* Create client SSL structure using dedicated client socket */ ssl = SSL_new(ssl_ctx); - if (!SSL_set_fd(ssl, client_skt)) { + if (!SSL_set_fd(ssl, (int)client_skt)) { ERR_print_errors_fp(stderr); goto exit; } @@ -329,14 +334,14 @@ int main(int argc, char **argv) break; } /* Send it to the server */ - if ((result = SSL_write(ssl, txbuf, strlen(txbuf))) <= 0) { + if ((result = SSL_write(ssl, txbuf, (int)strlen(txbuf))) <= 0) { printf("Server closed connection\n"); ERR_print_errors_fp(stderr); break; } /* Wait for the echo */ - rxlen = SSL_read(ssl, rxbuf, rxcap); + rxlen = SSL_read(ssl, rxbuf, (int)rxcap); if (rxlen <= 0) { printf("Server closed connection\n"); ERR_print_errors_fp(stderr); @@ -364,9 +369,9 @@ exit: SSL_CTX_free(ssl_ctx); if (client_skt != -1) - close(client_skt); + closesocket(client_skt); if (server_skt != -1) - close(server_skt); + closesocket(server_skt); printf("sslecho exiting\n");