From d7bfce3951087eaa1d6a41f2e9f50a4b2180c5a2 Mon Sep 17 00:00:00 2001 From: Steve Holme Date: Wed, 5 Nov 2014 13:35:27 +0000 Subject: [PATCH] http_digest: Moved algorithm definitions to SASL module --- lib/curl_sasl.h | 5 +++++ lib/http_digest.c | 1 + lib/http_digest.h | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index 68ef5526c..3576d4199 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -56,6 +56,11 @@ struct kerberos5data; #define SASL_MECH_STRING_NTLM "NTLM" #define SASL_MECH_STRING_XOAUTH2 "XOAUTH2" +enum { + CURLDIGESTALGO_MD5, + CURLDIGESTALGO_MD5SESS +}; + /* This is used to test whether the line starts with the given mechanism */ #define sasl_mech_equal(line, wordlen, mech) \ (wordlen == (sizeof(mech) - 1) / sizeof(char) && \ diff --git a/lib/http_digest.c b/lib/http_digest.c index 19de4d41e..1d42769c5 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -28,6 +28,7 @@ #include "rawstr.h" #include "curl_base64.h" #include "curl_md5.h" +#include "curl_sasl.h" #include "http_digest.h" #include "strtok.h" #include "curl_memory.h" diff --git a/lib/http_digest.h b/lib/http_digest.h index 42ed83c7b..d13d56374 100644 --- a/lib/http_digest.h +++ b/lib/http_digest.h @@ -23,11 +23,6 @@ ***************************************************************************/ #include "curl_setup.h" -enum { - CURLDIGESTALGO_MD5, - CURLDIGESTALGO_MD5SESS -}; - /* this is for digest header input */ CURLcode Curl_input_digest(struct connectdata *conn, bool proxy, const char *header); -- 2.50.1