[GNUnet-SVN] [gnurl] 08/73: build: fix --disable-crypto-auth

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnurl.

commit 7bc5308db3385cdc31efa8182b58e229eb721994
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Oct 5 00:20:34 2017 +0200

    build: fix --disable-crypto-auth
    
    Reported-by: Wyatt O'Day
    Fixes #1945
    Closes #1947
---
 lib/urldata.h   |  2 +-
 lib/vtls/vtls.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/urldata.h b/lib/urldata.h
index 66e4596fd..964999c1f 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -1453,7 +1453,7 @@ enum dupstring {
   STRING_PROXY_SERVICE_NAME, /* Proxy service name */
 #endif
 #if !defined(CURL_DISABLE_CRYPTO_AUTH) || defined(USE_KERBEROS5) || \
-    defined(USE_SPNEGO)
+  defined(USE_SPNEGO) || defined(HAVE_GSSAPI)
   STRING_SERVICE_NAME,    /* Service name */
 #endif
   STRING_MAIL_FROM,
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index bb8fda419..f95652520 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -1059,6 +1059,7 @@ bool Curl_none_false_start(void)
   return FALSE;
 }
 
+#ifndef CURL_DISABLE_CRYPTO_AUTH
 CURLcode Curl_none_md5sum(unsigned char *input, size_t inputlen,
                           unsigned char *md5sum, size_t md5len UNUSED_PARAM)
 {
@@ -1073,6 +1074,15 @@ CURLcode Curl_none_md5sum(unsigned char *input, size_t 
inputlen,
   Curl_MD5_final(MD5pw, md5sum);
   return CURLE_OK;
 }
+#else
+CURLcode Curl_none_md5sum(unsigned char *input UNUSED_PARAM,
+                          size_t inputlen UNUSED_PARAM,
+                          unsigned char *md5sum UNUSED_PARAM,
+                          size_t md5len UNUSED_PARAM)
+{
+  return CURLE_NOT_BUILT_IN;
+}
+#endif
 
 static int Curl_multissl_init(void)
 {

-- 
To stop receiving notification emails like this one, please contact
address@hidden