upstream: remove mostly vestigal uuencode.[ch]; moving the only unique

functionality there (wrapping of base64-encoded data) to sshbuf functions;
feedback and ok markus@

OpenBSD-Commit-ID: 4dba6735d88c57232f6fccec8a08bdcfea44ac4c

1 files changed, 25 insertions, 28 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 5dcad1f61..c2cfe8df0 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.336 2019/07/15 13:16:29 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.337 2019/07/16 13:18:39 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -43,7 +43,6 @@
 #include "xmalloc.h"
 #include "sshkey.h"
 #include "authfile.h"
-#include "uuencode.h"
 #include "sshbuf.h"
 #include "pathnames.h"
 #include "log.h"
@@ -301,25 +300,30 @@ load_identity(char *filename)
 static void
 do_convert_to_ssh2(struct passwd *pw, struct sshkey *k)
 {
-        size_t len;
-        u_char *blob;
-        char comment[61];
+        struct sshbuf *b;
+        char comment[61], *b64;
         int r;
 
-        if ((r = sshkey_to_blob(k, &blob, &len)) != 0)
+        if ((b = sshbuf_new()) == NULL)
+                fatal("%s: sshbuf_new failed", __func__);
+        if ((r = sshkey_putb(k, b)) != 0)
                 fatal("key_to_blob failed: %s", ssh_err(r));
+        if ((b64 = sshbuf_dtob64_string(b, 1)) == NULL)
+                fatal("%s: sshbuf_dtob64_string failed", __func__);
+
         /* Comment + surrounds must fit into 72 chars (RFC 4716 sec 3.3) */
         snprintf(comment, sizeof(comment),
             "%u-bit %s, converted by %s@%s from OpenSSH",
             sshkey_size(k), sshkey_type(k),
             pw->pw_name, hostname);
 
+        sshkey_free(k);
+        sshbuf_free(b);
+
         fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
-        fprintf(stdout, "Comment: \"%s\"\n", comment);
-        dump_base64(stdout, blob, len);
+        fprintf(stdout, "Comment: \"%s\"\n%s", comment, b64);
         fprintf(stdout, "%s\n", SSH_COM_PUBLIC_END);
-        sshkey_free(k);
-        free(blob);
+        free(b64);
         exit(0);
 }
 
@@ -413,9 +417,8 @@ buffer_get_bignum_bits(struct sshbuf *b, BIGNUM *value)
 }
 
 static struct sshkey *
-do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
+do_convert_private_ssh2(struct sshbuf *b)
 {
-        struct sshbuf *b;
         struct sshkey *key = NULL;
         char *type, *cipher;
         u_char e1, e2, e3, *sig = NULL, data[] = "abcde12345";
@@ -427,15 +430,13 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         BIGNUM *dsa_pub_key = NULL, *dsa_priv_key = NULL;
         BIGNUM *rsa_n = NULL, *rsa_e = NULL, *rsa_d = NULL;
         BIGNUM *rsa_p = NULL, *rsa_q = NULL, *rsa_iqmp = NULL;
-        if ((b = sshbuf_from(blob, blen)) == NULL)
-                fatal("%s: sshbuf_from failed", __func__);
+
         if ((r = sshbuf_get_u32(b, &magic)) != 0)
                 fatal("%s: buffer error: %s", __func__, ssh_err(r));
 
         if (magic != SSH_COM_PRIVATE_KEY_MAGIC) {
                 error("bad magic 0x%x != 0x%x", magic,
                     SSH_COM_PRIVATE_KEY_MAGIC);
-                sshbuf_free(b);
                 return NULL;
         }
         if ((r = sshbuf_get_u32(b, &i1)) != 0 ||
@@ -449,7 +450,6 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         if (strcmp(cipher, "none") != 0) {
                 error("unsupported cipher %s", cipher);
                 free(cipher);
-                sshbuf_free(b);
                 free(type);
                 return NULL;
         }
@@ -460,7 +460,6 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         } else if (strstr(type, "rsa")) {
                 ktype = KEY_RSA;
         } else {
-                sshbuf_free(b);
                 free(type);
                 return NULL;
         }
@@ -507,7 +506,6 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
                         fatal("%s: BN_new", __func__);
                 if (!BN_set_word(rsa_e, e)) {
                         BN_clear_free(rsa_e);
-                        sshbuf_free(b);
                         sshkey_free(key);
                         return NULL;
                 }
@@ -535,9 +533,7 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         }
         rlen = sshbuf_len(b);
         if (rlen != 0)
-                error("do_convert_private_ssh2_from_blob: "
-                    "remaining bytes in key blob %d", rlen);
-        sshbuf_free(b);
+                error("%s: remaining bytes in key blob %d", __func__, rlen);
 
         /* try the key */
         if (sshkey_sign(key, &sig, &slen, data, sizeof(data), NULL, 0) != 0 ||
@@ -582,10 +578,12 @@ do_convert_from_ssh2(struct passwd *pw, struct sshkey **k, int *private)
         int r, blen, escaped = 0;
         u_int len;
         char line[1024];
-        u_char blob[8096];
+        struct sshbuf *buf;
         char encoded[8096];
         FILE *fp;
 
+        if ((buf = sshbuf_new()) == NULL)
+                fatal("sshbuf_new failed");
         if ((fp = fopen(identity_file, "r")) == NULL)
                 fatal("%s: %s: %s", __progname, identity_file, strerror(errno));
         encoded[0] = '\0';
@@ -615,12 +613,11 @@ do_convert_from_ssh2(struct passwd *pw, struct sshkey **k, int *private)
             (encoded[len-2] == '=') &&
             (encoded[len-3] == '='))
                 encoded[len-3] = '\0';
-        blen = uudecode(encoded, blob, sizeof(blob));
-        if (blen < 0)
-                fatal("uudecode failed.");
+        if ((r = sshbuf_b64tod(buf, encoded)) != 0)
+                fatal("%s: base64 decoding failed: %s", __func__, ssh_err(r));
         if (*private)
-                *k = do_convert_private_ssh2_from_blob(blob, blen);
-        else if ((r = sshkey_from_blob(blob, blen, k)) != 0)
+                *k = do_convert_private_ssh2(buf);
+        else if ((r = sshkey_fromb(buf, k)) != 0)
                 fatal("decode blob failed: %s", ssh_err(r));
         fclose(fp);
 }
@@ -1739,7 +1736,7 @@ do_ca_sign(struct passwd *pw, const char *ca_key_path, int prefer_agent,
                 }
                 if (n > SSHKEY_CERT_MAX_PRINCIPALS)
                         fatal("Too many certificate principals specified");
-        
+
                 tmp = tilde_expand_filename(argv[i], pw->pw_uid);
                 if ((r = sshkey_load_public(tmp, &public, &comment)) != 0)
                         fatal("%s: unable to open \"%s\": %s",