diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-14 23:48:49 +0100 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-11-14 23:48:49 +0100 |
commit | 4b519cf51d02daacb388eb90bd0c5930145d7a0d (patch) | |
tree | bb5427a758fe78816cdfdf19d05f0836fa68ac6a /base64.c | |
parent | Merge branch 'feat_misc' into beta2.2 (diff) | |
parent | Fixed compiling issues when using --disable-crypto (diff) | |
download | openvpn-4b519cf51d02daacb388eb90bd0c5930145d7a0d.tar.xz |
Merge branch 'bugfix2.1' into beta2.2
Conflicts:
options.c
- Disagreements about a new included file (forward.h)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to '')
-rw-r--r-- | base64.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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 */ |