Copyright year updates

[thirdparty/openssl.git] / ssl / quic / qlog.c

diff --git a/ssl/quic/qlog.c b/ssl/quic/qlog.c
index e35c7d7b63c78fda58a70d746cfb322007811896..3aadda046f7493f527172a397d2370fe3cb8da8b 100644 (file)
--- a/ssl/quic/qlog.c
+++ b/ssl/quic/qlog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2023-2024 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -130,7 +130,7 @@ QLOG *ossl_qlog_new_from_env(const QLOG_TRACE_INFO *info)
         filename[l++] = qlogdir_sep;
 
     for (i = 0; i < info->odcid.id_len; ++i)
-        l += sprintf(filename + l, "%02x", info->odcid.id[i]);
+        l += BIO_snprintf(filename + l, strl - l, "%02x", info->odcid.id[i]);
 
     l += BIO_snprintf(filename + l, strl - l, "_%s.sqlog",
                       info->is_server ? "server" : "client");
@@ -162,8 +162,7 @@ void ossl_qlog_free(QLOG *qlog)
     if (qlog == NULL)
         return;
 
-    ossl_json_flush(&qlog->json);
-    ossl_json_cleanup(&qlog->json);
+    ossl_json_flush_cleanup(&qlog->json);
     BIO_free_all(qlog->bio);
     OPENSSL_free((char *)qlog->info.title);
     OPENSSL_free((char *)qlog->info.description);
@@ -317,9 +316,12 @@ static void qlog_event_seq_header(QLOG *qlog)
                         ossl_json_key(&qlog->json, "process_id");
                         ossl_json_u64(&qlog->json, qlog->info.override_process_id);
                     } else {
-#if defined(OPENSSL_SYS_UNIX) || defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_UNIX)
                         ossl_json_key(&qlog->json, "process_id");
                         ossl_json_u64(&qlog->json, (uint64_t)getpid());
+#elif defined(OPENSSL_SYS_WINDOWS)
+                        ossl_json_key(&qlog->json, "process_id");
+                        ossl_json_u64(&qlog->json, (uint64_t)GetCurrentProcessId());
 #endif
                     }
                 } /* system_info */
@@ -336,14 +338,14 @@ static void qlog_event_seq_header(QLOG *qlog)
                 if (qlog->info.override_impl_name != NULL) {
                     p = qlog->info.override_impl_name;
                 } else {
-                    snprintf(buf, sizeof(buf), "OpenSSL/%s (%s)",
-                             OpenSSL_version(OPENSSL_FULL_VERSION_STRING),
-                             OpenSSL_version(OPENSSL_PLATFORM) + 10);
+                    BIO_snprintf(buf, sizeof(buf), "OpenSSL/%s (%s)",
+                                 OpenSSL_version(OPENSSL_FULL_VERSION_STRING),
+                                 OpenSSL_version(OPENSSL_PLATFORM) + 10);
                 }
 
                 ossl_json_key(&qlog->json, "type");
-                ossl_json_str(&qlog->json, qlog->info.is_server
-                                  ? "server" : "client");
+                ossl_json_str(&qlog->json,
+                              qlog->info.is_server ? "server" : "client");
 
                 ossl_json_key(&qlog->json, "name");
                 ossl_json_str(&qlog->json, p);