diff options
Diffstat (limited to 'lib/vauth')
-rw-r--r-- | lib/vauth/cleartext.c | 6 | ||||
-rw-r--r-- | lib/vauth/cram.c | 2 | ||||
-rw-r--r-- | lib/vauth/digest.c | 4 | ||||
-rw-r--r-- | lib/vauth/digest_sspi.c | 4 | ||||
-rw-r--r-- | lib/vauth/krb5_gssapi.c | 4 | ||||
-rw-r--r-- | lib/vauth/krb5_sspi.c | 4 | ||||
-rw-r--r-- | lib/vauth/ntlm.c | 6 | ||||
-rw-r--r-- | lib/vauth/ntlm_sspi.c | 4 | ||||
-rw-r--r-- | lib/vauth/oauth2.c | 2 | ||||
-rw-r--r-- | lib/vauth/spnego_gssapi.c | 4 | ||||
-rw-r--r-- | lib/vauth/spnego_sspi.c | 4 | ||||
-rw-r--r-- | lib/vauth/vauth.h | 28 |
12 files changed, 36 insertions, 36 deletions
diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c index a003f51de..4e906bc07 100644 --- a/lib/vauth/cleartext.c +++ b/lib/vauth/cleartext.c @@ -59,7 +59,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_plain_message(struct SessionHandle *data, +CURLcode Curl_auth_create_plain_message(struct Curl_easy *data, const char *userp, const char *passwdp, char **outptr, size_t *outlen) @@ -110,7 +110,7 @@ CURLcode Curl_auth_create_plain_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_login_message(struct SessionHandle *data, +CURLcode Curl_auth_create_login_message(struct Curl_easy *data, const char *valuep, char **outptr, size_t *outlen) { @@ -148,7 +148,7 @@ CURLcode Curl_auth_create_login_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_external_message(struct SessionHandle *data, +CURLcode Curl_auth_create_external_message(struct Curl_easy *data, const char *user, char **outptr, size_t *outlen) { diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c index cd02e04ba..3074a163a 100644 --- a/lib/vauth/cram.c +++ b/lib/vauth/cram.c @@ -88,7 +88,7 @@ CURLcode Curl_auth_decode_cram_md5_message(const char *chlg64, char **outptr, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_cram_md5_message(struct SessionHandle *data, +CURLcode Curl_auth_create_cram_md5_message(struct Curl_easy *data, const char *chlg, const char *userp, const char *passwdp, diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index 72cf04829..26ea7b598 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -324,7 +324,7 @@ static CURLcode auth_decode_digest_md5_message(const char *chlg64, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_digest_md5_message(struct SessionHandle *data, +CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, const char *chlg64, const char *userp, const char *passwdp, @@ -645,7 +645,7 @@ CURLcode Curl_auth_decode_digest_http_message(const char *chlg, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_digest_http_message(struct SessionHandle *data, +CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, const char *userp, const char *passwdp, const unsigned char *request, diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index d13d08e56..c5bb35aca 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -62,7 +62,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_digest_md5_message(struct SessionHandle *data, +CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, const char *chlg64, const char *userp, const char *passwdp, @@ -349,7 +349,7 @@ CURLcode Curl_auth_decode_digest_http_message(const char *chlg, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_digest_http_message(struct SessionHandle *data, +CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, const char *userp, const char *passwdp, const unsigned char *request, diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c index 975675b5d..31c8c7da4 100644 --- a/lib/vauth/krb5_gssapi.c +++ b/lib/vauth/krb5_gssapi.c @@ -65,7 +65,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, +CURLcode Curl_auth_create_gssapi_user_message(struct Curl_easy *data, const char *userp, const char *passwdp, const char *service, @@ -190,7 +190,7 @@ CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, +CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data, const char *chlg64, struct kerberos5data *krb5, char **outptr, diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index bf56a64e7..08774f6c9 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -62,7 +62,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, +CURLcode Curl_auth_create_gssapi_user_message(struct Curl_easy *data, const char *userp, const char *passwdp, const char *service, @@ -240,7 +240,7 @@ CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, +CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data, const char *chlg64, struct kerberos5data *krb5, char **outptr, diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c index e27f4237b..c85fe4298 100644 --- a/lib/vauth/ntlm.c +++ b/lib/vauth/ntlm.c @@ -164,7 +164,7 @@ static void ntlm_print_hex(FILE *handle, const char *buf, size_t len) * * Returns CURLE_OK on success. */ -static CURLcode ntlm_decode_type2_target(struct SessionHandle *data, +static CURLcode ntlm_decode_type2_target(struct Curl_easy *data, unsigned char *buffer, size_t size, struct ntlmdata *ntlm) @@ -232,7 +232,7 @@ static CURLcode ntlm_decode_type2_target(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_decode_ntlm_type2_message(struct SessionHandle *data, +CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data, const char *type2msg, struct ntlmdata *ntlm) { @@ -465,7 +465,7 @@ CURLcode Curl_auth_create_ntlm_type1_message(const char *userp, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_ntlm_type3_message(struct SessionHandle *data, +CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, const char *userp, const char *passwdp, struct ntlmdata *ntlm, diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c index 532e270fd..982a9d378 100644 --- a/lib/vauth/ntlm_sspi.c +++ b/lib/vauth/ntlm_sspi.c @@ -162,7 +162,7 @@ CURLcode Curl_auth_create_ntlm_type1_message(const char *userp, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_decode_ntlm_type2_message(struct SessionHandle *data, +CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data, const char *type2msg, struct ntlmdata *ntlm) { @@ -214,7 +214,7 @@ CURLcode Curl_auth_decode_ntlm_type2_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_ntlm_type3_message(struct SessionHandle *data, +CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, const char *userp, const char *passwdp, struct ntlmdata *ntlm, diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c index fccdfb86c..6288f89a3 100644 --- a/lib/vauth/oauth2.c +++ b/lib/vauth/oauth2.c @@ -55,7 +55,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_oauth_bearer_message(struct SessionHandle *data, +CURLcode Curl_auth_create_oauth_bearer_message(struct Curl_easy *data, const char *user, const char *host, const long port, diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index 739e35b6e..9323bbbfb 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -58,7 +58,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, +CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, const char *user, const char *password, const char *service, @@ -187,7 +187,7 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_spnego_message(struct SessionHandle *data, +CURLcode Curl_auth_create_spnego_message(struct Curl_easy *data, struct negotiatedata *nego, char **outptr, size_t *outlen) { diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index 797466470..c0ef54691 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -57,7 +57,7 @@ * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, +CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, const char *user, const char *password, const char *service, @@ -234,7 +234,7 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, * * Returns CURLE_OK on success. */ -CURLcode Curl_auth_create_spnego_message(struct SessionHandle *data, +CURLcode Curl_auth_create_spnego_message(struct Curl_easy *data, struct negotiatedata *nego, char **outptr, size_t *outlen) { diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h index 2c5131c70..acff64275 100644 --- a/lib/vauth/vauth.h +++ b/lib/vauth/vauth.h @@ -24,7 +24,7 @@ #include <curl/curl.h> -struct SessionHandle; +struct Curl_easy; #if !defined(CURL_DISABLE_CRYPTO_AUTH) struct digestdata; @@ -56,18 +56,18 @@ TCHAR *Curl_auth_build_spn(const char *service, const char *host, #endif /* This is used to generate a base64 encoded PLAIN cleartext message */ -CURLcode Curl_auth_create_plain_message(struct SessionHandle *data, +CURLcode Curl_auth_create_plain_message(struct Curl_easy *data, const char *userp, const char *passwdp, char **outptr, size_t *outlen); /* This is used to generate a base64 encoded LOGIN cleartext message */ -CURLcode Curl_auth_create_login_message(struct SessionHandle *data, +CURLcode Curl_auth_create_login_message(struct Curl_easy *data, const char *valuep, char **outptr, size_t *outlen); /* This is used to generate a base64 encoded EXTERNAL cleartext message */ -CURLcode Curl_auth_create_external_message(struct SessionHandle *data, +CURLcode Curl_auth_create_external_message(struct Curl_easy *data, const char *user, char **outptr, size_t *outlen); @@ -77,14 +77,14 @@ CURLcode Curl_auth_decode_cram_md5_message(const char *chlg64, char **outptr, size_t *outlen); /* This is used to generate a CRAM-MD5 response message */ -CURLcode Curl_auth_create_cram_md5_message(struct SessionHandle *data, +CURLcode Curl_auth_create_cram_md5_message(struct Curl_easy *data, const char *chlg, const char *userp, const char *passwdp, char **outptr, size_t *outlen); /* This is used to generate a base64 encoded DIGEST-MD5 response message */ -CURLcode Curl_auth_create_digest_md5_message(struct SessionHandle *data, +CURLcode Curl_auth_create_digest_md5_message(struct Curl_easy *data, const char *chlg64, const char *userp, const char *passwdp, @@ -96,7 +96,7 @@ CURLcode Curl_auth_decode_digest_http_message(const char *chlg, struct digestdata *digest); /* This is used to generate a HTTP DIGEST response message */ -CURLcode Curl_auth_create_digest_http_message(struct SessionHandle *data, +CURLcode Curl_auth_create_digest_http_message(struct Curl_easy *data, const char *userp, const char *passwdp, const unsigned char *request, @@ -117,12 +117,12 @@ CURLcode Curl_auth_create_ntlm_type1_message(const char *userp, size_t *outlen); /* This is used to decode a base64 encoded NTLM type-2 message */ -CURLcode Curl_auth_decode_ntlm_type2_message(struct SessionHandle *data, +CURLcode Curl_auth_decode_ntlm_type2_message(struct Curl_easy *data, const char *type2msg, struct ntlmdata *ntlm); /* This is used to generate a base64 encoded NTLM type-3 message */ -CURLcode Curl_auth_create_ntlm_type3_message(struct SessionHandle *data, +CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data, const char *userp, const char *passwdp, struct ntlmdata *ntlm, @@ -133,7 +133,7 @@ void Curl_auth_ntlm_cleanup(struct ntlmdata *ntlm); #endif /* USE_NTLM */ /* This is used to generate a base64 encoded OAuth 2.0 message */ -CURLcode Curl_auth_create_oauth_bearer_message(struct SessionHandle *data, +CURLcode Curl_auth_create_oauth_bearer_message(struct Curl_easy *data, const char *user, const char *host, const long port, @@ -142,7 +142,7 @@ CURLcode Curl_auth_create_oauth_bearer_message(struct SessionHandle *data, #if defined(USE_KERBEROS5) /* This is used to generate a base64 encoded GSSAPI (Kerberos V5) user token message */ -CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, +CURLcode Curl_auth_create_gssapi_user_message(struct Curl_easy *data, const char *userp, const char *passwdp, const char *service, @@ -154,7 +154,7 @@ CURLcode Curl_auth_create_gssapi_user_message(struct SessionHandle *data, /* This is used to generate a base64 encoded GSSAPI (Kerberos V5) security token message */ -CURLcode Curl_auth_create_gssapi_security_message(struct SessionHandle *data, +CURLcode Curl_auth_create_gssapi_security_message(struct Curl_easy *data, const char *input, struct kerberos5data *krb5, char **outptr, @@ -167,7 +167,7 @@ void Curl_auth_gssapi_cleanup(struct kerberos5data *krb5); #if (defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)) && defined(USE_SPNEGO) /* This is used to decode a base64 encoded SPNEGO (Negotiate) challenge message */ -CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, +CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data, const char *user, const char *passwood, const char *service, @@ -177,7 +177,7 @@ CURLcode Curl_auth_decode_spnego_message(struct SessionHandle *data, /* This is used to generate a base64 encoded SPNEGO (Negotiate) response message */ -CURLcode Curl_auth_create_spnego_message(struct SessionHandle *data, +CURLcode Curl_auth_create_spnego_message(struct Curl_easy *data, struct negotiatedata *nego, char **outptr, size_t *outlen); |