- (djm) [regress/conch-ciphers.sh regress/putty-ciphers.sh]

[openssh.git] / uuencode.c

diff --git a/uuencode.c b/uuencode.c
index d5f2b96b3d707e22d0f5868ba9c8711c8a41538b..a13949585f8eb4ea1bf12496164927e29ef5a234 100644 (file)
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,5 +1,4 @@
-/*    $OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $    */
-
+/* $OpenBSD: uuencode.c,v 1.24 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -25,12 +24,17 @@
  */
 
 #include "includes.h"
-#include "xmalloc.h"
 
-RCSID("$OpenBSD: uuencode.c,v 1.10 2001/02/08 19:30:53 itojun Exp $");
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <resolv.h>
+#include <stdio.h>
+
+#include "xmalloc.h"
+#include "uuencode.h"
 
 int
-uuencode(u_char *src, u_int srclength,
+uuencode(const u_char *src, u_int srclength,
     char *target, size_t targsize)
 {
        return __b64_ntop(src, srclength, target, targsize);
@@ -49,7 +53,7 @@ uudecode(const char *src, u_char *target, size_t targsize)
                ;
        for (; *p != '\0' && *p != ' ' && *p != '\t'; p++)
                ;
-       /* and remote trailing whitespace because __b64_pton needs this */
+       /* and remove trailing whitespace because __b64_pton needs this */
        *p = '\0';
        len = __b64_pton(encoded, target, targsize);
        xfree(encoded);
@@ -57,10 +61,16 @@ uudecode(const char *src, u_char *target, size_t targsize)
 }
 
 void
-dump_base64(FILE *fp, u_char *data, int len)
+dump_base64(FILE *fp, u_char *data, u_int len)
 {
-       u_char *buf = xmalloc(2*len);
+       char *buf;
        int i, n;
+
+       if (len > 65536) {
+               fprintf(fp, "dump_base64: len > 65536\n");
+               return;
+       }
+       buf = xmalloc(2*len);
        n = uuencode(data, len, buf, 2*len);
        for (i = 0; i < n; i++) {
                fprintf(fp, "%c", buf[i]);