diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-04-23 16:53:02 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-04-23 16:53:02 +0000 |
| commit | d0c8c0bcc279fcf7568c5e97c15c115cbf83be4c (patch) | |
| tree | 70033bf9d0551c1f485a8bf5c04d41148812e33a /crypto/openssh/openbsd-compat/base64.c | |
| parent | 4b17dab0ba7675679933f9f3d4aed1cd28dd0393 (diff) | |
Notes
Diffstat (limited to 'crypto/openssh/openbsd-compat/base64.c')
| -rw-r--r-- | crypto/openssh/openbsd-compat/base64.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/openssh/openbsd-compat/base64.c b/crypto/openssh/openbsd-compat/base64.c index 005170b80dfd..91a5ab0ed824 100644 --- a/crypto/openssh/openbsd-compat/base64.c +++ b/crypto/openssh/openbsd-compat/base64.c @@ -44,7 +44,7 @@ #include "includes.h" -#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) +#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)) #include <sys/types.h> #include <sys/param.h> @@ -130,6 +130,7 @@ static const char Pad64 = '='; characters followed by one "=" padding character. */ +#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) int b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) { @@ -190,6 +191,9 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) target[datalength] = '\0'; /* Returned value doesn't count \0. */ return (datalength); } +#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */ + +#if !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) /* skips all whitespace anywhere. converts characters, four at a time, starting at (or after) @@ -314,4 +318,5 @@ b64_pton(char const *src, u_char *target, size_t targsize) return (tarindex); } -#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */ +#endif /* !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) */ +#endif |