summaryrefslogtreecommitdiff
path: root/openbsd-compat/base64.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2003-09-01 18:42:19 +0000
committerColin Watson <cjwatson@debian.org>2003-09-01 18:42:19 +0000
commit8d6b7f4c46de3feb66f704ab483e51ea1a3bb0e1 (patch)
tree41fe3dd71501bbec5b0393f1536c925eaee180e9 /openbsd-compat/base64.c
parentf045c69060bfdd5cf8759a5f29d7008d02e4de5b (diff)
parent58bfa257481a1c6938ada9bbd38801cc45633fb0 (diff)
Debian release 3.6p1-1.
Diffstat (limited to 'openbsd-compat/base64.c')
-rw-r--r--openbsd-compat/base64.c9
1 files changed, 7 insertions, 2 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)
133int 134int
134b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) 135b64_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