Import of OpenSSH 4.3p1

[gssapi-openssh.git] / openssh / openbsd-compat / base64.c

diff --git a/openssh/openbsd-compat/base64.c b/openssh/openbsd-compat/base64.c
index dcaa03e5d701d8855e585b7f40cf73bcba65f4e3..9a60f583b7e7d3ee6a4c0b1acaa007a29cca81ca 100644 (file)
--- a/openssh/openbsd-compat/base64.c
+++ b/openssh/openbsd-compat/base64.c
@@ -1,5 +1,3 @@
-/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
-
 /*     $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $      */
 
 /*
@@ -44,6 +42,8 @@
  * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
  */
 
+/* OPENBSD ORIGINAL: lib/libc/net/base64.c */
+
 #include "includes.h"
 
 #if (!defined(HAVE_B64_NTOP) && !defined(HAVE___B64_NTOP)) || (!defined(HAVE_B64_PTON) && !defined(HAVE___B64_PTON))
@@ -139,7 +139,7 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
        size_t datalength = 0;
        u_char input[3];
        u_char output[4];
-       int i;
+       u_int i;
 
        while (2 < srclength) {
                input[0] = *src++;
@@ -206,7 +206,8 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
 int
 b64_pton(char const *src, u_char *target, size_t targsize)
 {
-       int tarindex, state, ch;
+       u_int tarindex, state;
+       int ch;
        char *pos;
 
        state = 0;