external/openssh: update to 6.8p1.
In preparation for some updates to external/openssh to make it work with
BoringSSL, this change updates the code to a recent version. The current
version (5.9p1) is coming up on four years old now.
* Confirmed that f5c67b478bef9992de9e9ec91ce10af4f6205e0d matches
OpenSSH 5.9p1 exactly (save for the removal of the scard
subdirectory).
* Downloaded openssh-6.8p1.tar.gz (SHA256:
3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e)
and verified with PGP signature. (I've verified Damien's key in
person previously.)
* Applied changes between f5c67b478bef9992de9e9ec91ce10af4f6205e0d and
OpenSSH 5.9p1 to 6.8p1 and updated the build as best I can. The
ugliest change is probably the duplication of umac.c to umac128.c
because Android conditionally compiles that file twice. See the
comment in those files.
Change-Id: I63cb07a8118afb5a377f116087a0882914cea486
diff --git a/ssh-add.c b/ssh-add.c
index 6d5e2a9..98d46d3 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.101 2011/05/04 21:15:29 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.120 2015/02/21 21:46:57 halex Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -39,11 +39,11 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/param.h>
#include <openssl/evp.h>
#include "openbsd-compat/openssl-compat.h"
+#include <errno.h>
#include <fcntl.h>
#include <pwd.h>
#include <stdarg.h>
@@ -51,32 +51,40 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <limits.h>
#include "xmalloc.h"
#include "ssh.h"
#include "rsa.h"
#include "log.h"
-#include "key.h"
-#include "buffer.h"
+#include "sshkey.h"
+#include "sshbuf.h"
#include "authfd.h"
#include "authfile.h"
#include "pathnames.h"
#include "misc.h"
+#include "ssherr.h"
+#include "digest.h"
/* argv0 */
extern char *__progname;
/* Default files to add */
static char *default_files[] = {
+#ifdef WITH_OPENSSL
_PATH_SSH_CLIENT_ID_RSA,
_PATH_SSH_CLIENT_ID_DSA,
#ifdef OPENSSL_HAS_ECC
_PATH_SSH_CLIENT_ID_ECDSA,
#endif
+#endif /* WITH_OPENSSL */
+ _PATH_SSH_CLIENT_ID_ED25519,
_PATH_SSH_CLIENT_IDENTITY,
NULL
};
+static int fingerprint_hash = SSH_FP_HASH_DEFAULT;
+
/* Default lifetime (0 == forever) */
static int lifetime = 0;
@@ -89,46 +97,78 @@
clear_pass(void)
{
if (pass) {
- memset(pass, 0, strlen(pass));
- xfree(pass);
+ explicit_bzero(pass, strlen(pass));
+ free(pass);
pass = NULL;
}
}
static int
-delete_file(AuthenticationConnection *ac, const char *filename)
+delete_file(int agent_fd, const char *filename, int key_only)
{
- Key *public;
- char *comment = NULL;
- int ret = -1;
+ struct sshkey *public, *cert = NULL;
+ char *certpath = NULL, *comment = NULL;
+ int r, ret = -1;
- public = key_load_public(filename, &comment);
- if (public == NULL) {
- printf("Bad key file %s\n", filename);
+ if ((r = sshkey_load_public(filename, &public, &comment)) != 0) {
+ printf("Bad key file %s: %s\n", filename, ssh_err(r));
return -1;
}
- if (ssh_remove_identity(ac, public)) {
+ if ((r = ssh_remove_identity(agent_fd, public)) == 0) {
fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
ret = 0;
} else
- fprintf(stderr, "Could not remove identity: %s\n", filename);
+ fprintf(stderr, "Could not remove identity \"%s\": %s\n",
+ filename, ssh_err(r));
- key_free(public);
- xfree(comment);
+ if (key_only)
+ goto out;
+
+ /* Now try to delete the corresponding certificate too */
+ free(comment);
+ comment = NULL;
+ xasprintf(&certpath, "%s-cert.pub", filename);
+ if ((r = sshkey_load_public(certpath, &cert, &comment)) != 0) {
+ if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
+ error("Failed to load certificate \"%s\": %s",
+ certpath, ssh_err(r));
+ goto out;
+ }
+
+ if (!sshkey_equal_public(cert, public))
+ fatal("Certificate %s does not match private key %s",
+ certpath, filename);
+
+ if ((r = ssh_remove_identity(agent_fd, cert)) == 0) {
+ fprintf(stderr, "Identity removed: %s (%s)\n", certpath,
+ comment);
+ ret = 0;
+ } else
+ fprintf(stderr, "Could not remove identity \"%s\": %s\n",
+ certpath, ssh_err(r));
+
+ out:
+ if (cert != NULL)
+ sshkey_free(cert);
+ if (public != NULL)
+ sshkey_free(public);
+ free(certpath);
+ free(comment);
return ret;
}
/* Send a request to remove all identities. */
static int
-delete_all(AuthenticationConnection *ac)
+delete_all(int agent_fd)
{
int ret = -1;
- if (ssh_remove_all_identities(ac, 1))
+ if (ssh_remove_all_identities(agent_fd, 1) == 0)
ret = 0;
/* ignore error-code for ssh2 */
- ssh_remove_all_identities(ac, 2);
+ /* XXX revisit */
+ ssh_remove_all_identities(agent_fd, 2);
if (ret == 0)
fprintf(stderr, "All identities removed.\n");
@@ -139,13 +179,13 @@
}
static int
-add_file(AuthenticationConnection *ac, const char *filename)
+add_file(int agent_fd, const char *filename, int key_only)
{
- Key *private, *cert;
+ struct sshkey *private, *cert;
char *comment = NULL;
- char msg[1024], *certpath;
- int fd, perms_ok, ret = -1;
- Buffer keyblob;
+ char msg[1024], *certpath = NULL;
+ int r, fd, ret = -1;
+ struct sshbuf *keyblob;
if (strcmp(filename, "-") == 0) {
fd = STDIN_FILENO;
@@ -160,53 +200,73 @@
* will occur multiple times, so check perms first and bail if wrong.
*/
if (fd != STDIN_FILENO) {
- perms_ok = key_perm_ok(fd, filename);
- if (!perms_ok) {
+ if (sshkey_perm_ok(fd, filename) != 0) {
close(fd);
return -1;
}
}
- buffer_init(&keyblob);
- if (!key_load_file(fd, filename, &keyblob)) {
- buffer_free(&keyblob);
+ if ((keyblob = sshbuf_new()) == NULL)
+ fatal("%s: sshbuf_new failed", __func__);
+ if ((r = sshkey_load_file(fd, keyblob)) != 0) {
+ fprintf(stderr, "Error loading key \"%s\": %s\n",
+ filename, ssh_err(r));
+ sshbuf_free(keyblob);
close(fd);
return -1;
}
close(fd);
/* At first, try empty passphrase */
- private = key_parse_private(&keyblob, filename, "", &comment);
+ if ((r = sshkey_parse_private_fileblob(keyblob, "", filename,
+ &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
+ fprintf(stderr, "Error loading key \"%s\": %s\n",
+ filename, ssh_err(r));
+ goto fail_load;
+ }
+ /* try last */
+ if (private == NULL && pass != NULL) {
+ if ((r = sshkey_parse_private_fileblob(keyblob, pass, filename,
+ &private, &comment)) != 0 &&
+ r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
+ fprintf(stderr, "Error loading key \"%s\": %s\n",
+ filename, ssh_err(r));
+ goto fail_load;
+ }
+ }
if (comment == NULL)
comment = xstrdup(filename);
- /* try last */
- if (private == NULL && pass != NULL)
- private = key_parse_private(&keyblob, filename, pass, NULL);
if (private == NULL) {
/* clear passphrase since it did not work */
clear_pass();
- snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
- comment);
+ snprintf(msg, sizeof msg, "Enter passphrase for %.200s%s: ",
+ comment, confirm ? " (will confirm each use)" : "");
for (;;) {
pass = read_passphrase(msg, RP_ALLOW_STDIN);
- if (strcmp(pass, "") == 0) {
+ if (strcmp(pass, "") == 0)
+ goto fail_load;
+ if ((r = sshkey_parse_private_fileblob(keyblob, pass,
+ filename, &private, NULL)) == 0)
+ break;
+ else if (r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
+ fprintf(stderr,
+ "Error loading key \"%s\": %s\n",
+ filename, ssh_err(r));
+ fail_load:
clear_pass();
- xfree(comment);
- buffer_free(&keyblob);
+ free(comment);
+ sshbuf_free(keyblob);
return -1;
}
- private = key_parse_private(&keyblob, filename, pass,
- &comment);
- if (private != NULL)
- break;
clear_pass();
snprintf(msg, sizeof msg,
- "Bad passphrase, try again for %.200s: ", comment);
+ "Bad passphrase, try again for %.200s%s: ", comment,
+ confirm ? " (will confirm each use)" : "");
}
}
- buffer_free(&keyblob);
+ sshbuf_free(keyblob);
- if (ssh_add_identity_constrained(ac, private, comment, lifetime,
- confirm)) {
+ if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
+ lifetime, confirm)) == 0) {
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
ret = 0;
if (lifetime != 0)
@@ -216,35 +276,49 @@
fprintf(stderr,
"The user must confirm each use of the key\n");
} else {
- fprintf(stderr, "Could not add identity: %s\n", filename);
+ fprintf(stderr, "Could not add identity \"%s\": %s\n",
+ filename, ssh_err(r));
}
+ /* Skip trying to load the cert if requested */
+ if (key_only)
+ goto out;
/* Now try to add the certificate flavour too */
xasprintf(&certpath, "%s-cert.pub", filename);
- if ((cert = key_load_public(certpath, NULL)) == NULL)
+ if ((r = sshkey_load_public(certpath, &cert, NULL)) != 0) {
+ if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
+ error("Failed to load certificate \"%s\": %s",
+ certpath, ssh_err(r));
goto out;
+ }
- if (!key_equal_public(cert, private)) {
+ if (!sshkey_equal_public(cert, private)) {
error("Certificate %s does not match private key %s",
certpath, filename);
- key_free(cert);
+ sshkey_free(cert);
goto out;
}
/* Graft with private bits */
- if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) {
- error("%s: key_to_certified failed", __func__);
- key_free(cert);
+ if ((r = sshkey_to_certified(private,
+ sshkey_cert_is_legacy(cert))) != 0) {
+ error("%s: sshkey_to_certified: %s", __func__, ssh_err(r));
+ sshkey_free(cert);
goto out;
}
- key_cert_copy(cert, private);
- key_free(cert);
+ if ((r = sshkey_cert_copy(cert, private)) != 0) {
+ error("%s: key_cert_copy: %s", __func__, ssh_err(r));
+ sshkey_free(cert);
+ goto out;
+ }
+ sshkey_free(cert);
- if (!ssh_add_identity_constrained(ac, private, comment,
- lifetime, confirm)) {
- error("Certificate %s (%s) add failed", certpath,
- private->cert->key_id);
+ if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
+ lifetime, confirm)) != 0) {
+ error("Certificate %s (%s) add failed: %s", certpath,
+ private->cert->key_id, ssh_err(r));
+ goto out;
}
fprintf(stderr, "Certificate added: %s (%s)\n", certpath,
private->cert->key_id);
@@ -253,63 +327,77 @@
if (confirm != 0)
fprintf(stderr, "The user must confirm each use of the key\n");
out:
- xfree(certpath);
- xfree(comment);
- key_free(private);
+ free(certpath);
+ free(comment);
+ sshkey_free(private);
return ret;
}
static int
-update_card(AuthenticationConnection *ac, int add, const char *id)
+update_card(int agent_fd, int add, const char *id)
{
- char *pin;
- int ret = -1;
+ char *pin = NULL;
+ int r, ret = -1;
- pin = read_passphrase("Enter passphrase for PKCS#11: ", RP_ALLOW_STDIN);
- if (pin == NULL)
- return -1;
+ if (add) {
+ if ((pin = read_passphrase("Enter passphrase for PKCS#11: ",
+ RP_ALLOW_STDIN)) == NULL)
+ return -1;
+ }
- if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
+ if ((r = ssh_update_card(agent_fd, add, id, pin == NULL ? "" : pin,
+ lifetime, confirm)) == 0) {
fprintf(stderr, "Card %s: %s\n",
add ? "added" : "removed", id);
ret = 0;
} else {
- fprintf(stderr, "Could not %s card: %s\n",
- add ? "add" : "remove", id);
+ fprintf(stderr, "Could not %s card \"%s\": %s\n",
+ add ? "add" : "remove", id, ssh_err(r));
ret = -1;
}
- xfree(pin);
+ free(pin);
return ret;
}
static int
-list_identities(AuthenticationConnection *ac, int do_fp)
+list_identities(int agent_fd, int do_fp)
{
- Key *key;
- char *comment, *fp;
- int had_identities = 0;
- int version;
+ char *fp;
+ int version, r, had_identities = 0;
+ struct ssh_identitylist *idlist;
+ size_t i;
for (version = 1; version <= 2; version++) {
- for (key = ssh_get_first_identity(ac, &comment, version);
- key != NULL;
- key = ssh_get_next_identity(ac, &comment, version)) {
+ if ((r = ssh_fetch_identitylist(agent_fd, version,
+ &idlist)) != 0) {
+ if (r != SSH_ERR_AGENT_NO_IDENTITIES)
+ fprintf(stderr, "error fetching identities for "
+ "protocol %d: %s\n", version, ssh_err(r));
+ continue;
+ }
+ for (i = 0; i < idlist->nkeys; i++) {
had_identities = 1;
if (do_fp) {
- fp = key_fingerprint(key, SSH_FP_MD5,
- SSH_FP_HEX);
+ fp = sshkey_fingerprint(idlist->keys[i],
+ fingerprint_hash, SSH_FP_DEFAULT);
printf("%d %s %s (%s)\n",
- key_size(key), fp, comment, key_type(key));
- xfree(fp);
+ sshkey_size(idlist->keys[i]),
+ fp == NULL ? "(null)" : fp,
+ idlist->comments[i],
+ sshkey_type(idlist->keys[i]));
+ free(fp);
} else {
- if (!key_write(key, stdout))
- fprintf(stderr, "key_write failed");
- fprintf(stdout, " %s\n", comment);
+ if ((r = sshkey_write(idlist->keys[i],
+ stdout)) != 0) {
+ fprintf(stderr, "sshkey_write: %s\n",
+ ssh_err(r));
+ continue;
+ }
+ fprintf(stdout, " %s\n", idlist->comments[i]);
}
- key_free(key);
- xfree(comment);
}
+ ssh_free_identitylist(idlist);
}
if (!had_identities) {
printf("The agent has no identities.\n");
@@ -319,10 +407,10 @@
}
static int
-lock_agent(AuthenticationConnection *ac, int lock)
+lock_agent(int agent_fd, int lock)
{
char prompt[100], *p1, *p2;
- int passok = 1, ret = -1;
+ int r, passok = 1, ret = -1;
strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
@@ -333,27 +421,31 @@
fprintf(stderr, "Passwords do not match.\n");
passok = 0;
}
- memset(p2, 0, strlen(p2));
- xfree(p2);
+ explicit_bzero(p2, strlen(p2));
+ free(p2);
}
- if (passok && ssh_lock_agent(ac, lock, p1)) {
- fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
- ret = 0;
- } else
- fprintf(stderr, "Failed to %slock agent.\n", lock ? "" : "un");
- memset(p1, 0, strlen(p1));
- xfree(p1);
+ if (passok) {
+ if ((r = ssh_lock_agent(agent_fd, lock, p1)) == 0) {
+ fprintf(stderr, "Agent %slocked.\n", lock ? "" : "un");
+ ret = 0;
+ } else {
+ fprintf(stderr, "Failed to %slock agent: %s\n",
+ lock ? "" : "un", ssh_err(r));
+ }
+ }
+ explicit_bzero(p1, strlen(p1));
+ free(p1);
return (ret);
}
static int
-do_file(AuthenticationConnection *ac, int deleting, char *file)
+do_file(int agent_fd, int deleting, int key_only, char *file)
{
if (deleting) {
- if (delete_file(ac, file) == -1)
+ if (delete_file(agent_fd, file, key_only) == -1)
return -1;
} else {
- if (add_file(ac, file) == -1)
+ if (add_file(agent_fd, file, key_only) == -1)
return -1;
}
return 0;
@@ -365,13 +457,15 @@
fprintf(stderr, "usage: %s [options] [file ...]\n", __progname);
fprintf(stderr, "Options:\n");
fprintf(stderr, " -l List fingerprints of all identities.\n");
+ fprintf(stderr, " -E hash Specify hash algorithm used for fingerprints.\n");
fprintf(stderr, " -L List public key parameters of all identities.\n");
+ fprintf(stderr, " -k Load only keys and not certificates.\n");
+ fprintf(stderr, " -c Require confirmation to sign using identities\n");
+ fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
fprintf(stderr, " -d Delete identity.\n");
fprintf(stderr, " -D Delete all identities.\n");
fprintf(stderr, " -x Lock agent.\n");
fprintf(stderr, " -X Unlock agent.\n");
- fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
- fprintf(stderr, " -c Require confirmation to sign using identities\n");
fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n");
fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
}
@@ -381,9 +475,10 @@
{
extern char *optarg;
extern int optind;
- AuthenticationConnection *ac = NULL;
+ int agent_fd;
char *pkcs11provider = NULL;
- int i, ch, deleting = 0, ret = 0;
+ int r, i, ch, deleting = 0, ret = 0, key_only = 0;
+ int xflag = 0, lflag = 0, Dflag = 0;
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
sanitise_stdfd();
@@ -391,27 +486,47 @@
__progname = ssh_get_progname(argv[0]);
seed_rng();
+#ifdef WITH_OPENSSL
OpenSSL_add_all_algorithms();
+#endif
- /* At first, get a connection to the authentication agent. */
- ac = ssh_get_authentication_connection();
- if (ac == NULL) {
- fprintf(stderr,
- "Could not open a connection to your authentication agent.\n");
+ setvbuf(stdout, NULL, _IOLBF, 0);
+
+ /* First, get a connection to the authentication agent. */
+ switch (r = ssh_get_authentication_socket(&agent_fd)) {
+ case 0:
+ break;
+ case SSH_ERR_AGENT_NOT_PRESENT:
+ fprintf(stderr, "Could not open a connection to your "
+ "authentication agent.\n");
+ exit(2);
+ default:
+ fprintf(stderr, "Error connecting to agent: %s\n", ssh_err(r));
exit(2);
}
- while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+
+ while ((ch = getopt(argc, argv, "klLcdDxXE:e:s:t:")) != -1) {
switch (ch) {
+ case 'E':
+ fingerprint_hash = ssh_digest_alg_by_name(optarg);
+ if (fingerprint_hash == -1)
+ fatal("Invalid hash algorithm \"%s\"", optarg);
+ break;
+ case 'k':
+ key_only = 1;
+ break;
case 'l':
case 'L':
- if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
- ret = 1;
- goto done;
+ if (lflag != 0)
+ fatal("-%c flag already specified", lflag);
+ lflag = ch;
+ break;
case 'x':
case 'X':
- if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
- ret = 1;
- goto done;
+ if (xflag != 0)
+ fatal("-%c flag already specified", xflag);
+ xflag = ch;
+ break;
case 'c':
confirm = 1;
break;
@@ -419,9 +534,8 @@
deleting = 1;
break;
case 'D':
- if (delete_all(ac) == -1)
- ret = 1;
- goto done;
+ Dflag = 1;
+ break;
case 's':
pkcs11provider = optarg;
break;
@@ -442,15 +556,32 @@
goto done;
}
}
+
+ if ((xflag != 0) + (lflag != 0) + (Dflag != 0) > 1)
+ fatal("Invalid combination of actions");
+ else if (xflag) {
+ if (lock_agent(agent_fd, xflag == 'x' ? 1 : 0) == -1)
+ ret = 1;
+ goto done;
+ } else if (lflag) {
+ if (list_identities(agent_fd, lflag == 'l' ? 1 : 0) == -1)
+ ret = 1;
+ goto done;
+ } else if (Dflag) {
+ if (delete_all(agent_fd) == -1)
+ ret = 1;
+ goto done;
+ }
+
argc -= optind;
argv += optind;
if (pkcs11provider != NULL) {
- if (update_card(ac, !deleting, pkcs11provider) == -1)
+ if (update_card(agent_fd, !deleting, pkcs11provider) == -1)
ret = 1;
goto done;
}
if (argc == 0) {
- char buf[MAXPATHLEN];
+ char buf[PATH_MAX];
struct passwd *pw;
struct stat st;
int count = 0;
@@ -467,7 +598,7 @@
default_files[i]);
if (stat(buf, &st) < 0)
continue;
- if (do_file(ac, deleting, buf) == -1)
+ if (do_file(agent_fd, deleting, key_only, buf) == -1)
ret = 1;
else
count++;
@@ -476,13 +607,14 @@
ret = 1;
} else {
for (i = 0; i < argc; i++) {
- if (do_file(ac, deleting, argv[i]) == -1)
+ if (do_file(agent_fd, deleting, key_only,
+ argv[i]) == -1)
ret = 1;
}
}
clear_pass();
done:
- ssh_close_authentication_connection(ac);
+ ssh_close_authentication_socket(agent_fd);
return ret;
}