1 files changed, 115 insertions, 25 deletions

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 22860ad90..46b3af5a8 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.319 2018/08/08 01:16:01 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.322 2018/09/14 04:17:44 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -450,7 +450,10 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
         u_int magic, i1, i2, i3, i4;
         size_t slen;
         u_long e;
-
+        BIGNUM *dsa_p = NULL, *dsa_q = NULL, *dsa_g = NULL;
+        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)
@@ -488,17 +491,29 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
                 free(type);
                 return NULL;
         }
-        if ((key = sshkey_new_private(ktype)) == NULL)
-                fatal("sshkey_new_private failed");
+        if ((key = sshkey_new(ktype)) == NULL)
+                fatal("sshkey_new failed");
         free(type);
 
         switch (key->type) {
         case KEY_DSA:
-                buffer_get_bignum_bits(b, key->dsa->p);
-                buffer_get_bignum_bits(b, key->dsa->g);
-                buffer_get_bignum_bits(b, key->dsa->q);
-                buffer_get_bignum_bits(b, key->dsa->pub_key);
-                buffer_get_bignum_bits(b, key->dsa->priv_key);
+                if ((dsa_p = BN_new()) == NULL ||
+                    (dsa_q = BN_new()) == NULL ||
+                    (dsa_g = BN_new()) == NULL ||
+                    (dsa_pub_key = BN_new()) == NULL ||
+                    (dsa_priv_key = BN_new()) == NULL)
+                        fatal("%s: BN_new", __func__);
+                buffer_get_bignum_bits(b, dsa_p);
+                buffer_get_bignum_bits(b, dsa_g);
+                buffer_get_bignum_bits(b, dsa_q);
+                buffer_get_bignum_bits(b, dsa_pub_key);
+                buffer_get_bignum_bits(b, dsa_priv_key);
+                if (!DSA_set0_pqg(key->dsa, dsa_p, dsa_q, dsa_g))
+                        fatal("%s: DSA_set0_pqg failed", __func__);
+                dsa_p = dsa_q = dsa_g = NULL; /* transferred */
+                if (!DSA_set0_key(key->dsa, dsa_pub_key, dsa_priv_key))
+                        fatal("%s: DSA_set0_key failed", __func__);
+                dsa_pub_key = dsa_priv_key = NULL; /* transferred */
                 break;
         case KEY_RSA:
                 if ((r = sshbuf_get_u8(b, &e1)) != 0 ||
@@ -515,18 +530,34 @@ do_convert_private_ssh2_from_blob(u_char *blob, u_int blen)
                         e += e3;
                         debug("e %lx", e);
                 }
-                if (!BN_set_word(key->rsa->e, e)) {
+                if ((rsa_e = BN_new()) == NULL)
+                        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;
                 }
-                buffer_get_bignum_bits(b, key->rsa->d);
-                buffer_get_bignum_bits(b, key->rsa->n);
-                buffer_get_bignum_bits(b, key->rsa->iqmp);
-                buffer_get_bignum_bits(b, key->rsa->q);
-                buffer_get_bignum_bits(b, key->rsa->p);
-                if ((r = ssh_rsa_generate_additional_parameters(key)) != 0)
+                if ((rsa_n = BN_new()) == NULL ||
+                    (rsa_d = BN_new()) == NULL ||
+                    (rsa_p = BN_new()) == NULL ||
+                    (rsa_q = BN_new()) == NULL ||
+                    (rsa_iqmp = BN_new()) == NULL)
+                        fatal("%s: BN_new", __func__);
+                buffer_get_bignum_bits(b, rsa_d);
+                buffer_get_bignum_bits(b, rsa_n);
+                buffer_get_bignum_bits(b, rsa_iqmp);
+                buffer_get_bignum_bits(b, rsa_q);
+                buffer_get_bignum_bits(b, rsa_p);
+                if (!RSA_set0_key(key->rsa, rsa_n, rsa_e, rsa_d))
+                        fatal("%s: RSA_set0_key failed", __func__);
+                rsa_n = rsa_e = rsa_d = NULL; /* transferred */
+                if (!RSA_set0_factors(key->rsa, rsa_p, rsa_q))
+                        fatal("%s: RSA_set0_factors failed", __func__);
+                rsa_p = rsa_q = NULL; /* transferred */
+                if ((r = ssh_rsa_complete_crt_parameters(key, rsa_iqmp)) != 0)
                         fatal("generate RSA parameters failed: %s", ssh_err(r));
+                BN_clear_free(rsa_iqmp);
                 break;
         }
         rlen = sshbuf_len(b);
@@ -634,7 +665,7 @@ do_convert_from_pkcs8(struct sshkey **k, int *private)
                     identity_file);
         }
         fclose(fp);
-        switch (EVP_PKEY_type(pubkey->type)) {
+        switch (EVP_PKEY_base_id(pubkey)) {
         case EVP_PKEY_RSA:
                 if ((*k = sshkey_new(KEY_UNSPEC)) == NULL)
                         fatal("sshkey_new failed");
@@ -658,7 +689,7 @@ do_convert_from_pkcs8(struct sshkey **k, int *private)
 #endif
         default:
                 fatal("%s: unsupported pubkey type %d", __func__,
-                    EVP_PKEY_type(pubkey->type));
+                    EVP_PKEY_base_id(pubkey));
         }
         EVP_PKEY_free(pubkey);
         return;
@@ -2080,15 +2111,51 @@ load_krl(const char *path, struct ssh_krl **krlp)
 }
 
 static void
+hash_to_blob(const char *cp, u_char **blobp, size_t *lenp,
+    const char *file, u_long lnum)
+{
+        char *tmp;
+        size_t tlen;
+        struct sshbuf *b;
+        int r;
+
+        if (strncmp(cp, "SHA256:", 7) != 0)
+                fatal("%s:%lu: unsupported hash algorithm", file, lnum);
+        cp += 7;
+
+        /*
+         * OpenSSH base64 hashes omit trailing '='
+         * characters; put them back for decode.
+         */
+        tlen = strlen(cp);
+        tmp = xmalloc(tlen + 4 + 1);
+        strlcpy(tmp, cp, tlen + 1);
+        while ((tlen % 4) != 0) {
+                tmp[tlen++] = '=';
+                tmp[tlen] = '\0';
+        }
+        if ((b = sshbuf_new()) == NULL)
+                fatal("%s: sshbuf_new failed", __func__);
+        if ((r = sshbuf_b64tod(b, tmp)) != 0)
+                fatal("%s:%lu: decode hash failed: %s", file, lnum, ssh_err(r));
+        free(tmp);
+        *lenp = sshbuf_len(b);
+        *blobp = xmalloc(*lenp);
+        memcpy(*blobp, sshbuf_ptr(b), *lenp);
+        sshbuf_free(b);
+}
+
+static void
 update_krl_from_file(struct passwd *pw, const char *file, int wild_ca,
     const struct sshkey *ca, struct ssh_krl *krl)
 {
         struct sshkey *key = NULL;
         u_long lnum = 0;
         char *path, *cp, *ep, *line = NULL;
-        size_t linesize = 0;
+        u_char *blob = NULL;
+        size_t blen = 0, linesize = 0;
         unsigned long long serial, serial2;
-        int i, was_explicit_key, was_sha1, r;
+        int i, was_explicit_key, was_sha1, was_sha256, was_hash, r;
         FILE *krl_spec;
 
         path = tilde_expand_filename(file, pw->pw_uid);
@@ -2103,7 +2170,7 @@ update_krl_from_file(struct passwd *pw, const char *file, int wild_ca,
                 printf("Revoking from %s\n", path);
         while (getline(&line, &linesize, krl_spec) != -1) {
                 lnum++;
-                was_explicit_key = was_sha1 = 0;
+                was_explicit_key = was_sha1 = was_sha256 = was_hash = 0;
                 cp = line + strspn(line, " \t");
                 /* Trim trailing space, comments and strip \n */
                 for (i = 0, r = -1; cp[i] != '\0'; i++) {
@@ -2168,6 +2235,11 @@ update_krl_from_file(struct passwd *pw, const char *file, int wild_ca,
                         cp = cp + strspn(cp, " \t");
                         if (ssh_krl_revoke_cert_by_key_id(krl, ca, cp) != 0)
                                 fatal("%s: revoke key ID failed", __func__);
+                } else if (strncasecmp(cp, "hash:", 5) == 0) {
+                        cp += 5;
+                        cp = cp + strspn(cp, " \t");
+                        hash_to_blob(cp, &blob, &blen, file, lnum);
+                        r = ssh_krl_revoke_key_sha256(krl, blob, blen);
                 } else {
                         if (strncasecmp(cp, "key:", 4) == 0) {
                                 cp += 4;
@@ -2177,7 +2249,10 @@ update_krl_from_file(struct passwd *pw, const char *file, int wild_ca,
                                 cp += 5;
                                 cp = cp + strspn(cp, " \t");
                                 was_sha1 = 1;
-                        } else {
+                        } else if (strncasecmp(cp, "sha256:", 7) == 0) {
+                                cp += 7;
+                                cp = cp + strspn(cp, " \t");
+                                was_sha256 = 1;
                                 /*
                                  * Just try to process the line as a key.
                                  * Parsing will fail if it isn't.
@@ -2190,13 +2265,28 @@ update_krl_from_file(struct passwd *pw, const char *file, int wild_ca,
                                     path, lnum, ssh_err(r));
                         if (was_explicit_key)
                                 r = ssh_krl_revoke_key_explicit(krl, key);
-                        else if (was_sha1)
-                                r = ssh_krl_revoke_key_sha1(krl, key);
-                        else
+                        else if (was_sha1) {
+                                if (sshkey_fingerprint_raw(key,
+                                    SSH_DIGEST_SHA1, &blob, &blen) != 0) {
+                                        fatal("%s:%lu: fingerprint failed",
+                                            file, lnum);
+                                }
+                                r = ssh_krl_revoke_key_sha1(krl, blob, blen);
+                        } else if (was_sha256) {
+                                if (sshkey_fingerprint_raw(key,
+                                    SSH_DIGEST_SHA256, &blob, &blen) != 0) {
+                                        fatal("%s:%lu: fingerprint failed",
+                                            file, lnum);
+                                }
+                                r = ssh_krl_revoke_key_sha256(krl, blob, blen);
+                        } else
                                 r = ssh_krl_revoke_key(krl, key);
                         if (r != 0)
                                 fatal("%s: revoke key failed: %s",
                                     __func__, ssh_err(r));
+                        freezero(blob, blen);
+                        blob = NULL;
+                        blen = 0;
                         sshkey_free(key);
                 }
         }