Fix windows builds

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20109)

diff --git a/apps/cmp.c b/apps/cmp.c
index e44d32fd7f04965207920439471e31750538ec00..f72a77e3a3cbcb3260cd7f0574fc36ccc6e271bb 100644 (file)
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -2048,7 +2048,7 @@ static int save_cert_or_delete(X509 *cert, const char *file, const char *desc)
     if (cert == NULL) {
         char desc_cert[80];
 
-        snprintf(desc_cert, sizeof(desc_cert), "%s certificate", desc);
+        BIO_snprintf(desc_cert, sizeof(desc_cert), "%s certificate", desc);
         return delete_file(file, desc_cert);
     } else {
         STACK_OF(X509) *certs = sk_X509_new_null();

diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c
index 03afd715be377eafbb290ea3c88b04adf202a07a..622c908e52e14f55d3d840b47f013a5031646650 100644 (file)
--- a/apps/lib/http_server.c
+++ b/apps/lib/http_server.c
@@ -506,12 +506,12 @@ int http_server_send_asn1_resp(const char *prog, BIO *cbio, int keep_alive,
                                const ASN1_ITEM *it, const ASN1_VALUE *resp)
 {
     char buf[200], *p;
-    int ret = snprintf(buf, sizeof(buf), HTTP_1_0" 200 OK\r\n%s"
-                       "Content-type: %s\r\n"
-                       "Content-Length: %d\r\n",
-                       keep_alive ? "Connection: keep-alive\r\n" : "",
-                       content_type,
-                       ASN1_item_i2d(resp, NULL, it));
+    int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0" 200 OK\r\n%s"
+                           "Content-type: %s\r\n"
+                           "Content-Length: %d\r\n",
+                           keep_alive ? "Connection: keep-alive\r\n" : "",
+                           content_type,
+                           ASN1_item_i2d(resp, NULL, it));
 
     if (ret < 0 || (size_t)ret >= sizeof(buf))
         return 0;
@@ -532,9 +532,9 @@ int http_server_send_status(const char *prog, BIO *cbio,
                             int status, const char *reason)
 {
     char buf[200];
-    int ret = snprintf(buf, sizeof(buf), HTTP_1_0" %d %s\r\n\r\n",
-                       /* This implicitly cancels keep-alive */
-                       status, reason);
+    int ret = BIO_snprintf(buf, sizeof(buf), HTTP_1_0" %d %s\r\n\r\n",
+                           /* This implicitly cancels keep-alive */
+                           status, reason);
 
     if (ret < 0 || (size_t)ret >= sizeof(buf))
         return 0;

diff --git a/apps/lib/log.c b/apps/lib/log.c
index 7cf5ad5f893bbd4d7611fa4ca0107b1757dcb5d0..b2e356261f166a5aea1316c4fd96b74cff664f86 100644 (file)
--- a/apps/lib/log.c
+++ b/apps/lib/log.c
@@ -46,7 +46,7 @@ static void log_with_prefix(const char *prog, const char *fmt, va_list ap)
     char prefix[80];
     BIO *bio, *pre = BIO_new(BIO_f_prefix());
 
-    (void)snprintf(prefix, sizeof(prefix), "%s: ", prog);
+    (void)BIO_snprintf(prefix, sizeof(prefix), "%s: ", prog);
     (void)BIO_set_prefix(pre, prefix);
     bio = BIO_push(pre, bio_err);
     (void)BIO_vprintf(bio, fmt, ap);

diff --git a/test/hpke_test.c b/test/hpke_test.c
index fc2f80857f4d2e3e147666ff62bb217869f7b2b5..b2d2e51dc4ae4d36012e9128704f5712af040d96 100644 (file)
--- a/test/hpke_test.c
+++ b/test/hpke_test.c
@@ -1204,8 +1204,8 @@ static int test_hpke_suite_strs(void)
     for (kemind = 0; kemind != OSSL_NELEM(kem_str_list); kemind++) {
         for (kdfind = 0; kdfind != OSSL_NELEM(kdf_str_list); kdfind++) {
             for (aeadind = 0; aeadind != OSSL_NELEM(aead_str_list); aeadind++) {
-                snprintf(sstr, 128, "%s,%s,%s", kem_str_list[kemind],
-                         kdf_str_list[kdfind], aead_str_list[aeadind]);
+                BIO_snprintf(sstr, 128, "%s,%s,%s", kem_str_list[kemind],
+                             kdf_str_list[kdfind], aead_str_list[aeadind]);
                 if (TEST_true(OSSL_HPKE_str2suite(sstr, &stirred)) != 1) {
                     if (verbose)
                         TEST_note("Unexpected str2suite fail for :%s",