diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-06-15 21:50:57 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-06-15 21:50:57 +0200 |
| commit | ac3e356c95b3867b96070da2f85022b6280921d1 (patch) | |
| tree | 10e6d7f83a9d7d59089ab350340713e90071d72f | |
| parent | a96fa00f3831acdf18c778ebee88d61dbc432d4f (diff) | |
SSPI related code: Unicode support for WinCE - kill compiler warnings
| -rw-r--r-- | lib/curl_ntlm_msgs.c | 7 | ||||
| -rw-r--r-- | lib/http_negotiate_sspi.c | 5 | ||||
| -rw-r--r-- | lib/socks_sspi.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c index 0fd34cb80..b064553c2 100644 --- a/lib/curl_ntlm_msgs.c +++ b/lib/curl_ntlm_msgs.c @@ -460,7 +460,8 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, else ntlm->p_identity = NULL; - status = s_pSecFn->AcquireCredentialsHandle(NULL, TEXT("NTLM"), + status = s_pSecFn->AcquireCredentialsHandle(NULL, + (SECURITY_PSTR) TEXT("NTLM"), SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity, NULL, NULL, &ntlm->handle, &tsDummy); @@ -475,7 +476,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, buf.pvBuffer = ntlmbuf; status = s_pSecFn->InitializeSecurityContext(&ntlm->handle, NULL, - TEXT(""), + (SECURITY_PSTR) TEXT(""), ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION, @@ -651,7 +652,7 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data, status = s_pSecFn->InitializeSecurityContext(&ntlm->handle, &ntlm->c_handle, - TEXT(""), + (SECURITY_PSTR) TEXT(""), ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION, diff --git a/lib/http_negotiate_sspi.c b/lib/http_negotiate_sspi.c index 59a270a0d..7c8235518 100644 --- a/lib/http_negotiate_sspi.c +++ b/lib/http_negotiate_sspi.c @@ -138,7 +138,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, if(!neg_ctx->output_token) { PSecPkgInfo SecurityPackage; - ret = s_pSecFn->QuerySecurityPackageInfo(TEXT("Negotiate"), + ret = s_pSecFn->QuerySecurityPackageInfo((SECURITY_PSTR) TEXT("Negotiate"), &SecurityPackage); if(ret != SEC_E_OK) return -1; @@ -167,7 +167,8 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, return -1; neg_ctx->status = - s_pSecFn->AcquireCredentialsHandle(NULL, TEXT("Negotiate"), + s_pSecFn->AcquireCredentialsHandle(NULL, + (SECURITY_PSTR) TEXT("Negotiate"), SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, neg_ctx->credentials, &lifetime); diff --git a/lib/socks_sspi.c b/lib/socks_sspi.c index 8bbaef101..a1d82ea76 100644 --- a/lib/socks_sspi.c +++ b/lib/socks_sspi.c @@ -141,7 +141,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, cred_handle.dwUpper = 0; status = s_pSecFn->AcquireCredentialsHandle(NULL, - TEXT("Kerberos"), + (SECURITY_PSTR) TEXT("Kerberos"), SECPKG_CRED_OUTBOUND, NULL, NULL, |