[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 08/73: build: fix --disable-crypto-auth
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 08/73: build: fix --disable-crypto-auth |
Date: |
Tue, 24 Oct 2017 18:53:49 +0200 |
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
- [GNUnet-SVN] [gnurl] branch master updated (dc0683b64 -> 8252aa305), gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 02/73: ftp: UBsan fixup 'pointer index expression overflowed', gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 10/73: openssl: fix build without HAVE_OPAQUE_EVP_PKEY, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 09/73: lib/config-win32.h: let SMB/SMBS be enabled with OpenSSL/NSS, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 08/73: build: fix --disable-crypto-auth,
gnunet <=
- [GNUnet-SVN] [gnurl] 05/73: lib/Makefile.m32: allow customizing dll suffixes, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 07/73: darwinssl: add support for TLSv1.3, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 03/73: failf: skip the sprintf() if there are no consumers, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 26/73: test643: verify curl_mime_subparts() rejects cyclic additions., gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 35/73: test298: verify --ftp-method nowcwd with URL encoded path, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 20/73: mime: be tolerant about setting twice the same header list in a part., gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 12/73: multi_cleanup: call DONE on handles that never got that, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 01/73: RELEASE-PROCEDURE: update the release schedule, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 14/73: tests: added flaky keyword to tests 587 and 644, gnunet, 2017/10/24
- [GNUnet-SVN] [gnurl] 33/73: CURLOPT_NOPROGRESS.3: also refer to xferinfofunction, gnunet, 2017/10/24