From 423d68b0ede7f10c02fa753cba8d60d2218d2dc7 Mon Sep 17 00:00:00 2001 From: James Yonan Date: Sun, 14 Nov 2010 23:38:47 +0100 Subject: Fixed compiling issues when using --disable-crypto MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Peter Korsgaard reported an issue [1] when compiling with --disable-crypto activated. He suggested a patch, which only partly solved the issue. SVN r6568 / commit 3cf9dd88fd84108 added a new feature which further made it impossible to compile without crypto. This patch fixes both issues, based on Peter Korsgaard's patch. [1]  Signed-off-by: James Yonan Acked-by: David Sommerseth Signed-off-by: David Sommerseth --- base64.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'base64.c') diff --git a/base64.c b/base64.c index 2cc3944..3449ae5 100644 --- a/base64.c +++ b/base64.c @@ -80,8 +80,6 @@ base64_encode(const void *data, int size, char **str) return strlen(s); } -#if NTLM - static int pos(char c) { @@ -137,8 +135,6 @@ base64_decode(const char *str, void *data) return q - (unsigned char *) data; } -#endif /* NTLM, PKCS#11 */ - #else static void dummy(void) {} -#endif +#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */ -- cgit v1.2.3