X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/a306f2dd74b7488671decc385f82830c98f4a0d3..436c347c5c743689757f5e6f07928caf8e9ed16f:/uuencode.c

diff --git a/uuencode.c b/uuencode.c
index 62689005..f3774f1f 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,114 +1,69 @@
+/*	$OpenBSD: uuencode.c,v 1.12 2001/03/01 02:27:18 deraadt Exp $	*/
+
 /*
- *   base-64 encoding pinched from lynx2-7-2, who pinched it from rpem.
- *   Originally written by Mark Riordan 12 August 1990 and 17 Feb 1991
- *   and placed in the public domain.
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
  *
- *   Dug Song <dugsong@UMICH.EDU>
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
 #include "xmalloc.h"
+#include "uuencode.h"
 
-char six2pr[64] = {
-	'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-	'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-	'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-	'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'
-};
-
-unsigned char pr2six[256];
+RCSID("$OpenBSD: uuencode.c,v 1.12 2001/03/01 02:27:18 deraadt Exp $");
 
 int
-uuencode(unsigned char *bufin, unsigned int nbytes, char *bufcoded)
+uuencode(u_char *src, u_int srclength,
+    char *target, size_t targsize)
 {
-	/* ENC is the basic 1 character encoding function to make a char printing */
-#define ENC(c) six2pr[c]
-
-	register char *outptr = bufcoded;
-	unsigned int i;
-
-	for (i = 0; i < nbytes; i += 3) {
-		*(outptr++) = ENC(*bufin >> 2);						/* c1 */
-		*(outptr++) = ENC(((*bufin << 4) & 060)   | ((bufin[1] >> 4) & 017));	/* c2 */
-		*(outptr++) = ENC(((bufin[1] << 2) & 074) | ((bufin[2] >> 6) & 03));	/* c3 */
-		*(outptr++) = ENC(bufin[2] & 077);					/* c4 */
-		bufin += 3;
-	}
-	if (i == nbytes + 1) {
-		outptr[-1] = '=';
-	} else if (i == nbytes + 2) {
-		outptr[-1] = '=';
-		outptr[-2] = '=';
-	} else if (i == nbytes) {
-		*(outptr++) = '=';
-	}
-	*outptr = '\0';
-	return (outptr - bufcoded);
+	return __b64_ntop(src, srclength, target, targsize);
 }
 
 int
-uudecode(const char *bufcoded, unsigned char *bufplain, int outbufsize)
+uudecode(const char *src, u_char *target, size_t targsize)
 {
-	/* single character decode */
-#define DEC(c) pr2six[(unsigned char)c]
-#define MAXVAL 63
-
-	static int first = 1;
-	int nbytesdecoded, j;
-	const char *bufin = bufcoded;
-	register unsigned char *bufout = bufplain;
-	register int nprbytes;
+	int len;
+	char *encoded, *p;
 
-	/* If this is the first call, initialize the mapping table. */
-	if (first) {
-		first = 0;
-		for (j = 0; j < 256; j++)
-			pr2six[j] = MAXVAL + 1;
-		for (j = 0; j < 64; j++)
-			pr2six[(unsigned char) six2pr[j]] = (unsigned char) j;
-	}
-	/* Strip leading whitespace. */
-	while (*bufcoded == ' ' || *bufcoded == '\t')
-		bufcoded++;
-
-	/*
-	 * Figure out how many characters are in the input buffer. If this
-	 * would decode into more bytes than would fit into the output
-	 * buffer, adjust the number of input bytes downwards.
-	 */
-	bufin = bufcoded;
-	while (DEC(*(bufin++)) <= MAXVAL)
+	/* copy the 'readonly' source */
+	encoded = xstrdup(src);
+	/* skip whitespace and data */
+	for (p = encoded; *p == ' ' || *p == '\t'; p++)
 		;
-	nprbytes = bufin - bufcoded - 1;
-	nbytesdecoded = ((nprbytes + 3) / 4) * 3;
-	if (nbytesdecoded > outbufsize)
-		nprbytes = (outbufsize * 4) / 3;
-
-	bufin = bufcoded;
-
-	while (nprbytes > 0) {
-		*(bufout++) = (unsigned char) (DEC(*bufin)   << 2 | DEC(bufin[1]) >> 4);
-		*(bufout++) = (unsigned char) (DEC(bufin[1]) << 4 | DEC(bufin[2]) >> 2);
-		*(bufout++) = (unsigned char) (DEC(bufin[2]) << 6 | DEC(bufin[3]));
-		bufin += 4;
-		nprbytes -= 4;
-	}
-	if (nprbytes & 03) {
-		if (DEC(bufin[-2]) > MAXVAL)
-			nbytesdecoded -= 2;
-		else
-			nbytesdecoded -= 1;
-	}
-	return (nbytesdecoded);
+	for (; *p != '\0' && *p != ' ' && *p != '\t'; p++)
+		;
+	/* and remote trailing whitespace because __b64_pton needs this */
+	*p = '\0';
+	len = __b64_pton(encoded, target, targsize);
+	xfree(encoded);
+	return len;
 }
 
 void
-dump_base64(FILE *fp, unsigned char *data, int len)
+dump_base64(FILE *fp, u_char *data, int len)
 {
-	unsigned char *buf = xmalloc(2*len);
+	u_char *buf = xmalloc(2*len);
 	int i, n;
-	n = uuencode(data, len, buf);
+
+	n = uuencode(data, len, buf, 2*len);
 	for (i = 0; i < n; i++) {
 		fprintf(fp, "%c", buf[i]);
 		if (i % 70 == 69)