aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssl/apps/lib/win32_init.c
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2026-04-09 01:44:24 +0000
committerEnji Cooper <ngie@FreeBSD.org>2026-04-12 02:14:40 +0000
commite2fcde7333a515907316cf1a4ee4858edc90419d (patch)
tree25413360bfddba499d8c3d965cfe532272ad4975 /crypto/openssl/apps/lib/win32_init.c
parent2a97b49bc47228618242843d0d84f51ec67f3f36 (diff)
MFV: crypto/openssl: update to 3.5.6
This change brings in version 3.5.6 of OpenSSL, which features several security fixes (the highest of which is a MEDIUM severity issue), as well as some miscellaneous feature updates. Please see the release notes [1] for more details. PS Apologies for the confusing merge commits -- I was testing out a new automated update process and failed to catch the commit message issues until after I pushed the change. 1. https://github.com/openssl/openssl/blob/openssl-3.5.6/NEWS.md MFC after: 1 day (the security issues warrant a quick backport). Merge commit 'ab5fc4ac933ff67bc800e774dffce15e2a541e90' (cherry picked from commit 10a428653ee7216475f1ddce3fb4cbf1200319f8)
Diffstat (limited to 'crypto/openssl/apps/lib/win32_init.c')
-rw-r--r--crypto/openssl/apps/lib/win32_init.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/openssl/apps/lib/win32_init.c b/crypto/openssl/apps/lib/win32_init.c
index 824eb676310e..0ea2048283cb 100644
--- a/crypto/openssl/apps/lib/win32_init.c
+++ b/crypto/openssl/apps/lib/win32_init.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2026 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
@@ -10,7 +10,6 @@
#include <windows.h>
#include <stdlib.h>
#include <string.h>
-#include <malloc.h>
#if defined(CP_UTF8)