summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/http_digest.c
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-04 13:56:39 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-04 13:56:39 (GMT)
commit85d966dcd7a29a17e42fde7b1c109e642f063d82 (patch)
tree4a963906e6f83ad32d02adf681dfe1e1a7160d1d /Utilities/cmcurl/lib/http_digest.c
parent2c0e87fff3347189db7454cf55669eec45819d9a (diff)
parentf59ab43370dc9bff7e6480032c95505cdd00e3cd (diff)
downloadCMake-85d966dcd7a29a17e42fde7b1c109e642f063d82.zip
CMake-85d966dcd7a29a17e42fde7b1c109e642f063d82.tar.gz
CMake-85d966dcd7a29a17e42fde7b1c109e642f063d82.tar.bz2
Merge topic 'update-curl'
f59ab433 curl: Remove CMake-specific README f53f4a8a Merge branch 'upstream-curl' into update-curl 202adcfe curl 2016-08-03 (f2cb3a01) e1c11352 curl: Update script to get curl 7.50.1 a51c6c53 Merge branch 'upstream-curl' into update-curl 7ec709d3 curl 2015-08-11 (1a7f66a3) 3e9b0343 Add script to update curl from upstream
Diffstat (limited to 'Utilities/cmcurl/lib/http_digest.c')
-rw-r--r--Utilities/cmcurl/lib/http_digest.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/Utilities/cmcurl/lib/http_digest.c b/Utilities/cmcurl/lib/http_digest.c
index 929e2c6..97230e7 100644
--- a/Utilities/cmcurl/lib/http_digest.c
+++ b/Utilities/cmcurl/lib/http_digest.c
@@ -5,11 +5,11 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
+ * are also available at https://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
@@ -26,11 +26,10 @@
#include "urldata.h"
#include "rawstr.h"
-#include "curl_sasl.h"
+#include "vauth/vauth.h"
#include "http_digest.h"
+/* The last 3 #include files should be in this order */
#include "curl_printf.h"
-
-/* The last #include files should be: */
#include "curl_memory.h"
#include "memdebug.h"
@@ -46,7 +45,7 @@ CURLcode Curl_input_digest(struct connectdata *conn,
const char *header) /* rest of the *-authenticate:
header */
{
- struct SessionHandle *data = conn->data;
+ struct Curl_easy *data = conn->data;
/* Point to the correct struct with this */
struct digestdata *digest;
@@ -65,7 +64,7 @@ CURLcode Curl_input_digest(struct connectdata *conn,
while(*header && ISSPACE(*header))
header++;
- return Curl_sasl_decode_digest_http_message(header, digest);
+ return Curl_auth_decode_digest_http_message(header, digest);
}
CURLcode Curl_output_digest(struct connectdata *conn,
@@ -74,7 +73,7 @@ CURLcode Curl_output_digest(struct connectdata *conn,
const unsigned char *uripath)
{
CURLcode result;
- struct SessionHandle *data = conn->data;
+ struct Curl_easy *data = conn->data;
unsigned char *path;
char *tmp;
char *response;
@@ -135,7 +134,7 @@ CURLcode Curl_output_digest(struct connectdata *conn,
Apache servers can be set to do the Digest IE-style automatically using
the BrowserMatch feature:
- http://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#msie
+ https://httpd.apache.org/docs/2.2/mod/mod_auth_digest.html#msie
Further details on Digest implementation differences:
http://www.fngtps.com/2006/09/http-authentication
@@ -152,7 +151,7 @@ CURLcode Curl_output_digest(struct connectdata *conn,
if(!path)
return CURLE_OUT_OF_MEMORY;
- result = Curl_sasl_create_digest_http_message(data, userp, passwdp, request,
+ result = Curl_auth_create_digest_http_message(data, userp, passwdp, request,
path, digest, &response, &len);
free(path);
if(result)
@@ -170,10 +169,10 @@ CURLcode Curl_output_digest(struct connectdata *conn,
return CURLE_OK;
}
-void Curl_digest_cleanup(struct SessionHandle *data)
+void Curl_digest_cleanup(struct Curl_easy *data)
{
- Curl_sasl_digest_cleanup(&data->state.digest);
- Curl_sasl_digest_cleanup(&data->state.proxydigest);
+ Curl_auth_digest_cleanup(&data->state.digest);
+ Curl_auth_digest_cleanup(&data->state.proxydigest);
}
#endif