- Remove references to SSLeay.

 - Big OpenBSD CVS update
  - markus@cvs.openbsd.org
    [clientloop.c]
    - typo
    [session.c]
    - update proctitle on pty alloc/dealloc, e.g. w/ windows client
    [session.c]
    - update proctitle for proto 1, too
    [channels.h nchan.c serverloop.c session.c sshd.c]
    - use c-style comments
  - deraadt@cvs.openbsd.org
    [scp.c]
    - more atomicio
  - markus@cvs.openbsd.org
    [channels.c]
    - set O_NONBLOCK
    [ssh.1]
    - update AUTHOR
    [readconf.c ssh-keygen.c ssh.h]
    - default DSA key file ~/.ssh/id_dsa
    [clientloop.c]
    - typo, rm verbose debug
  - deraadt@cvs.openbsd.org
    [ssh-keygen.1]
    - document DSA use of ssh-keygen
    [sshd.8]
    - a start at describing what i understand of the DSA side
    [ssh-keygen.1]
    - document -X and -x
    [ssh-keygen.c]
    - simplify usage
  - markus@cvs.openbsd.org
    [sshd.8]
    - there is no rhosts_dsa
    [ssh-keygen.1]
    - document -y, update -X,-x
    [nchan.c]
    - fix close for non-open ssh1 channels
    [servconf.c servconf.h ssh.h sshd.8 sshd.c ]
    - s/DsaKey/HostDSAKey/, document option
    [sshconnect2.c]
    - respect number_of_password_prompts
    [channels.c channels.h servconf.c servconf.h session.c sshd.8]
    - GatewayPorts for sshd, ok deraadt@
    [ssh-add.1 ssh-agent.1 ssh.1]
    - more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
    [ssh.1]
    - more info on proto 2
    [sshd.8]
    - sync AUTHOR w/ ssh.1
    [key.c key.h sshconnect.c]
    - print key type when talking about host keys
    [packet.c]
    - clear padding in ssh2
    [dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
    - replace broken uuencode w/ libc b64_ntop
    [auth2.c]
    - log failure before sending the reply
    [key.c radix.c uuencode.c]
    - remote trailing comments before calling __b64_pton
    [auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
    [sshconnect2.c sshd.8]
    - add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
 - Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])

1 files changed, 20 insertions, 90 deletions

diff --git a/uuencode.c b/uuencode.c
index 626890050..fc84d5a58 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,106 +1,36 @@
 /*
- *   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.
- *
- *   Dug Song <dugsong@UMICH.EDU>
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  */
-
 #include "includes.h"
 #include "xmalloc.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];
+#include <resolv.h>
 
 int
-uuencode(unsigned char *bufin, unsigned int nbytes, char *bufcoded)
+uuencode(unsigned char *src, unsigned 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, unsigned 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
@@ -108,7 +38,7 @@ dump_base64(FILE *fp, unsigned char *data, int len)
 {
         unsigned 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)