http_digest: Moved algorithm definitions to SASL module

diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h
index 68ef5526ceac10a29277b242de9637ff705fe171..3576d41990cf350924a67d0f1d9b0102954654e4 100644 (file)
--- 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 19de4d41e51f9fbe3a540738bab2efd29b13e75d..1d42769c534e170ef4312281d1d93fc817781a7e 100644 (file)
--- 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 42ed83c7bae357cadd163869d5b73980abcca444..d13d56374983b9963156cb8e7c2354530a77b057 100644 (file)
--- 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);