X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/12408a1b16c3ce5b7e203bec879ceb3d67ae09a8..f96b1f670e759a7834f281f437f64550fdfecd97:/openssh/openbsd-compat/base64.c

diff --git a/openssh/openbsd-compat/base64.c b/openssh/openbsd-compat/base64.c
index dcaa03e..d12b993 100644
--- a/openssh/openbsd-compat/base64.c
+++ b/openssh/openbsd-compat/base64.c
@@ -1,6 +1,4 @@
-/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
-
-/*	$OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $	*/
+/*	$OpenBSD: base64.c,v 1.3 1997/11/08 20:46:55 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -44,9 +42,9 @@
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
-#include "includes.h"
+#include "config.h"
 
-#if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
+#if !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -62,7 +60,6 @@
 
 #include "base64.h"
 
-/* XXX abort illegal in library */
 #define Assert(Cond) if (!(Cond)) abort()
 
 static const char Base64[] =
@@ -132,7 +129,6 @@ 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)
 {
@@ -193,9 +189,6 @@ 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)
@@ -320,5 +313,4 @@ b64_pton(char const *src, u_char *target, size_t targsize)
 	return (tarindex);
 }
 
-#endif /* !defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON) */
-#endif 
+#endif /* !defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP) */