curl: switched back to OpenSSL, updated to latest version
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* 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
|
||||
@@ -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"
|
||||
|
||||
@@ -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,
|
||||
@@ -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)
|
||||
@@ -172,8 +171,8 @@ CURLcode Curl_output_digest(struct connectdata *conn,
|
||||
|
||||
void Curl_digest_cleanup(struct SessionHandle *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
|
||||
|
||||
Reference in New Issue
Block a user