diff options
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/base64.c | 9 | ||||
-rw-r--r-- | openbsd-compat/base64.h | 11 |
2 files changed, 15 insertions, 5 deletions
diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c index 005170b80..91a5ab0ed 100644 --- a/openbsd-compat/base64.c +++ b/openbsd-compat/base64.c | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | #include "includes.h" | 45 | #include "includes.h" |
46 | 46 | ||
47 | #if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) | 47 | #if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON)) |
48 | 48 | ||
49 | #include <sys/types.h> | 49 | #include <sys/types.h> |
50 | #include <sys/param.h> | 50 | #include <sys/param.h> |
@@ -130,6 +130,7 @@ static const char Pad64 = '='; | |||
130 | characters followed by one "=" padding character. | 130 | characters followed by one "=" padding character. |
131 | */ | 131 | */ |
132 | 132 | ||
133 | #if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) | ||
133 | int | 134 | int |
134 | b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) | 135 | b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) |
135 | { | 136 | { |
@@ -190,6 +191,9 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) | |||
190 | target[datalength] = '\0'; /* Returned value doesn't count \0. */ | 191 | target[datalength] = '\0'; /* Returned value doesn't count \0. */ |
191 | return (datalength); | 192 | return (datalength); |
192 | } | 193 | } |
194 | #endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */ | ||
195 | |||
196 | #if !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) | ||
193 | 197 | ||
194 | /* skips all whitespace anywhere. | 198 | /* skips all whitespace anywhere. |
195 | converts characters, four at a time, starting at (or after) | 199 | 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) | |||
314 | return (tarindex); | 318 | return (tarindex); |
315 | } | 319 | } |
316 | 320 | ||
317 | #endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */ | 321 | #endif /* !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) */ |
322 | #endif | ||
diff --git a/openbsd-compat/base64.h b/openbsd-compat/base64.h index c92e70ea0..72db3ffc7 100644 --- a/openbsd-compat/base64.h +++ b/openbsd-compat/base64.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: base64.h,v 1.3 2002/02/26 16:59:59 stevesk Exp $ */ | 1 | /* $Id: base64.h,v 1.4 2003/02/24 04:45:43 djm Exp $ */ |
2 | 2 | ||
3 | #ifndef _BSD_BASE64_H | 3 | #ifndef _BSD_BASE64_H |
4 | #define _BSD_BASE64_H | 4 | #define _BSD_BASE64_H |
@@ -9,10 +9,15 @@ | |||
9 | # ifndef HAVE_B64_NTOP | 9 | # ifndef HAVE_B64_NTOP |
10 | int b64_ntop(u_char const *src, size_t srclength, char *target, | 10 | int b64_ntop(u_char const *src, size_t srclength, char *target, |
11 | size_t targsize); | 11 | size_t targsize); |
12 | int b64_pton(char const *src, u_char *target, size_t targsize); | ||
13 | # endif /* !HAVE_B64_NTOP */ | 12 | # endif /* !HAVE_B64_NTOP */ |
14 | # define __b64_ntop b64_ntop | 13 | # define __b64_ntop b64_ntop |
15 | # define __b64_pton b64_pton | ||
16 | #endif /* HAVE___B64_NTOP */ | 14 | #endif /* HAVE___B64_NTOP */ |
17 | 15 | ||
16 | #ifndef HAVE___B64_PTON | ||
17 | # ifndef HAVE_B64_PTON | ||
18 | int b64_pton(char const *src, u_char *target, size_t targsize); | ||
19 | # endif /* !HAVE_B64_PTON */ | ||
20 | # define __b64_pton b64_pton | ||
21 | #endif /* HAVE___B64_PTON */ | ||
22 | |||
18 | #endif /* _BSD_BASE64_H */ | 23 | #endif /* _BSD_BASE64_H */ |