Use ANSI functions explicitly

laudrup · May 17, 2024 · b498697 · b498697
1 parent 0077d73
commit b498697
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/include/wintls/detail/sspi_functions.hpp b/include/wintls/detail/sspi_functions.hpp
@@ -22,7 +22,7 @@ inline SecurityFunctionTable* sspi_function_table() {
   return impl;
 }
 
-inline SECURITY_STATUS AcquireCredentialsHandle(SEC_CHAR* pPrincipal,
+inline SECURITY_STATUS AcquireCredentialsHandleA(SEC_CHAR* pPrincipal,
                                                 SEC_CHAR* pPackage,
                                                 unsigned long fCredentialUse,
                                                 void* pvLogonId,
@@ -31,7 +31,7 @@ inline SECURITY_STATUS AcquireCredentialsHandle(SEC_CHAR* pPrincipal,
                                                 void* pvGetKeyArgument,
                                                 PCredHandle phCredential,
                                                 PTimeStamp ptsExpiry) {
-  return sspi_function_table()->AcquireCredentialsHandle(pPrincipal,
+  return sspi_function_table()->AcquireCredentialsHandleA(pPrincipal,
                                                           pPackage,
                                                           fCredentialUse,
                                                           pvLogonId,
@@ -46,7 +46,7 @@ inline SECURITY_STATUS DeleteSecurityContext(PCtxtHandle phContext) {
   return sspi_function_table()->DeleteSecurityContext(phContext);
 }
 
-inline SECURITY_STATUS InitializeSecurityContext(PCredHandle phCredential,
+inline SECURITY_STATUS InitializeSecurityContextA(PCredHandle phCredential,
                                                  PCtxtHandle phContext,
                                                  SEC_CHAR* pTargetName,
                                                  unsigned long fContextReq,
@@ -58,7 +58,7 @@ inline SECURITY_STATUS InitializeSecurityContext(PCredHandle phCredential,
                                                  PSecBufferDesc pOutput,
                                                  unsigned long* pfContextAttr,
                                                  PTimeStamp ptsExpiry) {
-  return sspi_function_table()->InitializeSecurityContext(phCredential,
+  return sspi_function_table()->InitializeSecurityContextA(phCredential,
                                                            phContext,
                                                            pTargetName,
                                                            fContextReq,

diff --git a/include/wintls/detail/sspi_handshake.hpp b/include/wintls/detail/sspi_handshake.hpp
@@ -88,7 +88,7 @@ class sspi_handshake {
     }
 
     TimeStamp expiry;
-    last_error_ = detail::sspi_functions::AcquireCredentialsHandle(nullptr,
+    last_error_ = detail::sspi_functions::AcquireCredentialsHandleA(nullptr,
                                                                    const_cast<SEC_CHAR*>(UNISP_NAME),
                                                                    static_cast<unsigned>(usage),
                                                                    nullptr,
@@ -106,7 +106,7 @@ class sspi_handshake {
         DWORD out_flags = 0;
 
         handshake_output_buffers buffers;
-        last_error_ = detail::sspi_functions::InitializeSecurityContext(cred_handle_.get(),
+        last_error_ = detail::sspi_functions::InitializeSecurityContextA(cred_handle_.get(),
                                                                         nullptr,
                                                                         const_cast<SEC_CHAR*>(server_hostname_.c_str()),
                                                                         client_context_flags,
@@ -148,7 +148,7 @@ class sspi_handshake {
 
     switch(handshake_type_) {
       case handshake_type::client:
-        last_error_ = detail::sspi_functions::InitializeSecurityContext(cred_handle_.get(),
+        last_error_ = detail::sspi_functions::InitializeSecurityContextA(cred_handle_.get(),
                                                                         ctxt_handle_.get(),
                                                                         const_cast<SEC_CHAR*>(server_hostname_.c_str()),
                                                                         client_context_flags,

diff --git a/include/wintls/detail/sspi_shutdown.hpp b/include/wintls/detail/sspi_shutdown.hpp
@@ -36,7 +36,7 @@ class sspi_shutdown {
     }
 
     DWORD out_flags = 0;
-    sc = detail::sspi_functions::InitializeSecurityContext(cred_handle_.get(),
+    sc = detail::sspi_functions::InitializeSecurityContextA(cred_handle_.get(),
                                                            ctxt_handle_.get(),
                                                            nullptr,
                                                            client_context_flags,