aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2014-08-09 17:32:12 +0100
committerSteve Holme <steve_holme@hotmail.com>2014-08-09 18:55:20 +0100
commitd01e30431ceca2d201b123a37003e45090f7759b (patch)
treea6b99e3a63aa06f2cceb5826b25f008b92035463
parentff5dcb8df209d486534e5eb0487d5aab69564f38 (diff)
sasl: Tidy up to rename SPN variable from URI
-rw-r--r--lib/curl_sasl.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index f9482255d..1068dc8fe 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -441,7 +441,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
char nonceCount[] = "00000001";
char method[] = "AUTHENTICATE";
char qop[] = DIGEST_QOP_VALUE_STRING_AUTH;
- char *uri = NULL;
+ char *spn = NULL;
/* Decode the challange message */
result = sasl_decode_digest_md5_message(chlg64, nonce, sizeof(nonce),
@@ -506,15 +506,15 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
for(i = 0; i < MD5_DIGEST_LEN; i++)
snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]);
- /* Prepare the URL string */
- uri = Curl_sasl_build_spn(service, realm);
- if(!uri)
+ /* Generate our SPN */
+ spn = Curl_sasl_build_spn(service, realm);
+ if(!spn)
return CURLE_OUT_OF_MEMORY;
/* Calculate H(A2) */
ctxt = Curl_MD5_init(Curl_DIGEST_MD5);
if(!ctxt) {
- Curl_safefree(uri);
+ Curl_safefree(spn);
return CURLE_OUT_OF_MEMORY;
}
@@ -522,8 +522,8 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
Curl_MD5_update(ctxt, (const unsigned char *) method,
curlx_uztoui(strlen(method)));
Curl_MD5_update(ctxt, (const unsigned char *) ":", 1);
- Curl_MD5_update(ctxt, (const unsigned char *) uri,
- curlx_uztoui(strlen(uri)));
+ Curl_MD5_update(ctxt, (const unsigned char *) spn,
+ curlx_uztoui(strlen(spn)));
Curl_MD5_final(ctxt, digest);
for(i = 0; i < MD5_DIGEST_LEN; i++)
@@ -532,7 +532,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
/* Now calculate the response hash */
ctxt = Curl_MD5_init(Curl_DIGEST_MD5);
if(!ctxt) {
- Curl_safefree(uri);
+ Curl_safefree(spn);
return CURLE_OUT_OF_MEMORY;
}
@@ -564,7 +564,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
"cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s,"
"qop=%s",
userp, realm, nonce,
- cnonce, nonceCount, uri, resp_hash_hex, qop);
+ cnonce, nonceCount, spn, resp_hash_hex, qop);
if(!response)
return CURLE_OUT_OF_MEMORY;
@@ -572,11 +572,11 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data,
result = Curl_base64_encode(data, response, 0, outptr, outlen);
Curl_safefree(response);
- Curl_safefree(uri);
+ Curl_safefree(spn);
return result;
}
-#endif /* USE_WINDOWS_SSPI */
+#endif /* !USE_WINDOWS_SSPI */
#endif /* CURL_DISABLE_CRYPTO_AUTH */