Commit ac3e356c authored by Yang Tse's avatar Yang Tse
Browse files

SSPI related code: Unicode support for WinCE - kill compiler warnings

parent a96fa00f

lib/curl_ntlm_msgs.c

+4 −3
Original line number Diff line number Diff line
@@ -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,

lib/http_negotiate_sspi.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

lib/socks_sspi.c

+1 −1
Original line number Diff line number Diff line
@@ -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,