From d69a0dfe73de6aa698caa8580d3bf54e76bd0dca Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Wed, 13 May 2026 17:08:32 +0200 Subject: [PATCH] Do not use deprecated aliases on Windows Both these work perfectly fine but are discouraged and might cause warnings by compilers. Identified by cppcheck. Change-Id: I04e35928244e6ecda8c58285a812516662b50742 Signed-off-by: Frank Lichtenheld Acked-by: Heiko Hund Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1673 Message-Id: <20260513150838.27382-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg36909.html Signed-off-by: Gert Doering --- src/openvpn/cryptoapi.c | 4 ++-- src/openvpnmsica/openvpnmsica.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index e17936a9..bf80bbd0 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -235,7 +235,7 @@ test_certificate_template(const char *cert_prop, const CERT_CONTEXT *cert_ctx) if (pvext && cbext >= sizeof(CERT_TEMPLATE_EXT)) { const CERT_TEMPLATE_EXT *cte = (const CERT_TEMPLATE_EXT *)pvext; - if (!stricmp(cert_prop, cte->pszObjId)) + if (!_stricmp(cert_prop, cte->pszObjId)) { /* found direct OID match with certificate property specified */ gc_free(&gc); @@ -244,7 +244,7 @@ test_certificate_template(const char *cert_prop, const CERT_CONTEXT *cert_ctx) const CRYPT_OID_INFO *tmpl_oid = find_oid(CRYPT_OID_INFO_NAME_KEY, tmpl_name, CRYPT_TEMPLATE_OID_GROUP_ID); - if (tmpl_oid && !stricmp(tmpl_oid->pszOID, cte->pszObjId)) + if (tmpl_oid && !_stricmp(tmpl_oid->pszOID, cte->pszObjId)) { /* found OID match in extension against resolved key */ gc_free(&gc); diff --git a/src/openvpnmsica/openvpnmsica.c b/src/openvpnmsica/openvpnmsica.c index fdb610ca..9d12963e 100644 --- a/src/openvpnmsica/openvpnmsica.c +++ b/src/openvpnmsica/openvpnmsica.c @@ -508,7 +508,7 @@ schedule_adapter_create(_Inout_ struct msica_arg_seq *seq, *iTicks += MSICA_ADAPTER_TICK_SIZE; break; } - else if (wcsicmp(szDisplayName, pAdapterOther->szName) == 0) + else if (_wcsicmp(szDisplayName, pAdapterOther->szName) == 0) { /* Adapter with a same name found. */ for (LPCWSTR hwid = pAdapterOther->szzHardwareIDs;; hwid += wcslen(hwid) + 1) @@ -521,7 +521,7 @@ schedule_adapter_create(_Inout_ struct msica_arg_seq *seq, dwResult = ERROR_ALREADY_EXISTS; goto cleanup_pAdapterList; } - else if (wcsicmp(hwid, szHardwareId) == 0) + else if (_wcsicmp(hwid, szHardwareId) == 0) { /* This is an adapter with the requested hardware ID. We already have what we * want! */ @@ -583,7 +583,7 @@ schedule_adapter_delete(_Inout_ struct msica_arg_seq *seq, for (struct tap_adapter_node *pAdapter = pAdapterList; pAdapter != NULL; pAdapter = pAdapter->pNext) { - if (wcsicmp(szDisplayName, pAdapter->szName) == 0) + if (_wcsicmp(szDisplayName, pAdapter->szName) == 0) { /* Adapter found. */ WCHAR szArgument[8 /*disable=|enable=|delete=*/ @@ -1084,7 +1084,7 @@ ProcessDeferredAction(_In_ MSIHANDLE hInstall) for (struct tap_adapter_node *pAdapter = pAdapterList; pAdapter != NULL; pAdapter = pAdapter->pNext) { - if (wcsicmp(szName, pAdapter->szName) == 0) + if (_wcsicmp(szName, pAdapter->szName) == 0) { /* Adapter found. */ dwResult = tap_delete_adapter(NULL, &pAdapter->guid, &bRebootRequired);