Browse code

Fixed compiling issues when using --disable-crypto

Peter Korsgaard <jacmet@sunsite.dk> 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] <http://sourceforge.net/mailarchive/forum.php?thread_name=87fwx08bod.fsf%40macbook.be.48ers.dk&forum_name=openvpn-devel>

Signed-off-by: James Yonan <james@openvpn.net>
Acked-by: David Sommerseth <dazo@users.sourceforge.net>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

James Yonan authored on 2010/11/15 07:38:47
Showing 2 changed files
... ...
@@ -80,8 +80,6 @@ base64_encode(const void *data, int size, char **str)
80 80
     return strlen(s);
81 81
 }
82 82
 
83
-#if NTLM
84
-
85 83
 static int 
86 84
 pos(char c)
87 85
 {
... ...
@@ -137,8 +135,6 @@ base64_decode(const char *str, void *data)
137 137
     return q - (unsigned char *) data;
138 138
 }
139 139
 
140
-#endif /* NTLM, PKCS#11 */
141
-
142 140
 #else
143 141
 static void dummy(void) {}
144
-#endif
142
+#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */
... ...
@@ -45,6 +45,7 @@
45 45
 #include "pool.h"
46 46
 #include "helper.h"
47 47
 #include "manage.h"
48
+#include "forward.h"
48 49
 
49 50
 #include "memdbg.h"
50 51