2015-07-02 13:18:50 +00:00
|
|
|
/* $OpenBSD: ssh-add.c,v 1.122 2015/03/26 12:32:38 naddy Exp $ */
|
2000-02-24 14:29:47 +00:00
|
|
|
/*
|
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* Adds an identity to the authentication server, or removes an identity.
|
2000-09-10 08:31:17 +00:00
|
|
|
*
|
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
|
|
*
|
|
|
|
* SSH2 implementation,
|
2002-03-18 09:55:03 +00:00
|
|
|
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
2000-09-10 08:31:17 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* 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.
|
2000-02-24 14:29:47 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "includes.h"
|
2006-09-30 13:29:51 +00:00
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
2000-05-15 04:37:24 +00:00
|
|
|
|
2000-09-10 08:31:17 +00:00
|
|
|
#include <openssl/evp.h>
|
2008-07-23 09:28:49 +00:00
|
|
|
#include "openbsd-compat/openssl-compat.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
#include <errno.h>
|
2006-09-30 13:29:51 +00:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <pwd.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
2015-07-02 13:15:34 +00:00
|
|
|
#include <limits.h>
|
2006-09-30 13:29:51 +00:00
|
|
|
|
|
|
|
#include "xmalloc.h"
|
2000-02-24 14:29:47 +00:00
|
|
|
#include "ssh.h"
|
2001-05-04 03:57:05 +00:00
|
|
|
#include "rsa.h"
|
|
|
|
#include "log.h"
|
2015-07-02 13:15:34 +00:00
|
|
|
#include "sshkey.h"
|
|
|
|
#include "sshbuf.h"
|
2000-09-10 08:31:17 +00:00
|
|
|
#include "authfd.h"
|
2000-05-15 04:37:24 +00:00
|
|
|
#include "authfile.h"
|
2001-05-04 03:57:05 +00:00
|
|
|
#include "pathnames.h"
|
2002-06-23 14:01:54 +00:00
|
|
|
#include "misc.h"
|
2015-01-05 16:09:55 +00:00
|
|
|
#include "ssherr.h"
|
2015-07-02 13:15:34 +00:00
|
|
|
#include "digest.h"
|
2001-05-04 03:57:05 +00:00
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
/* argv0 */
|
|
|
|
extern char *__progname;
|
|
|
|
|
|
|
|
/* Default files to add */
|
|
|
|
static char *default_files[] = {
|
2015-07-02 13:15:34 +00:00
|
|
|
#ifdef WITH_OPENSSL
|
2002-03-18 09:55:03 +00:00
|
|
|
_PATH_SSH_CLIENT_ID_RSA,
|
|
|
|
_PATH_SSH_CLIENT_ID_DSA,
|
2011-02-17 11:47:40 +00:00
|
|
|
#ifdef OPENSSL_HAS_ECC
|
|
|
|
_PATH_SSH_CLIENT_ID_ECDSA,
|
|
|
|
#endif
|
2015-07-02 13:15:34 +00:00
|
|
|
#endif /* WITH_OPENSSL */
|
2014-01-30 10:56:49 +00:00
|
|
|
_PATH_SSH_CLIENT_ID_ED25519,
|
2015-07-02 13:18:50 +00:00
|
|
|
#ifdef WITH_SSH1
|
2002-06-23 14:01:54 +00:00
|
|
|
_PATH_SSH_CLIENT_IDENTITY,
|
2015-07-02 13:18:50 +00:00
|
|
|
#endif
|
2002-03-18 09:55:03 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
static int fingerprint_hash = SSH_FP_HASH_DEFAULT;
|
|
|
|
|
2002-06-23 14:01:54 +00:00
|
|
|
/* Default lifetime (0 == forever) */
|
|
|
|
static int lifetime = 0;
|
2002-03-18 09:55:03 +00:00
|
|
|
|
2003-04-23 16:53:02 +00:00
|
|
|
/* User has to confirm key use */
|
|
|
|
static int confirm = 0;
|
|
|
|
|
2001-05-04 03:57:05 +00:00
|
|
|
/* we keep a cache of one passphrases */
|
|
|
|
static char *pass = NULL;
|
2002-03-18 09:55:03 +00:00
|
|
|
static void
|
2001-05-04 03:57:05 +00:00
|
|
|
clear_pass(void)
|
|
|
|
{
|
|
|
|
if (pass) {
|
2014-03-22 15:23:38 +00:00
|
|
|
explicit_bzero(pass, strlen(pass));
|
2013-09-18 17:27:38 +00:00
|
|
|
free(pass);
|
2001-05-04 03:57:05 +00:00
|
|
|
pass = NULL;
|
|
|
|
}
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
delete_file(int agent_fd, const char *filename, int key_only)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2015-07-02 13:15:34 +00:00
|
|
|
struct sshkey *public, *cert = NULL;
|
2013-03-22 11:19:48 +00:00
|
|
|
char *certpath = NULL, *comment = NULL;
|
2015-07-02 13:15:34 +00:00
|
|
|
int r, ret = -1;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
if ((r = sshkey_load_public(filename, &public, &comment)) != 0) {
|
|
|
|
printf("Bad key file %s: %s\n", filename, ssh_err(r));
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
if ((r = ssh_remove_identity(agent_fd, public)) == 0) {
|
2000-02-24 14:29:47 +00:00
|
|
|
fprintf(stderr, "Identity removed: %s (%s)\n", filename, comment);
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 0;
|
|
|
|
} else
|
2015-07-02 13:15:34 +00:00
|
|
|
fprintf(stderr, "Could not remove identity \"%s\": %s\n",
|
|
|
|
filename, ssh_err(r));
|
2002-03-18 09:55:03 +00:00
|
|
|
|
2013-03-22 11:19:48 +00:00
|
|
|
if (key_only)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Now try to delete the corresponding certificate too */
|
|
|
|
free(comment);
|
|
|
|
comment = NULL;
|
|
|
|
xasprintf(&certpath, "%s-cert.pub", filename);
|
2015-07-02 13:15:34 +00:00
|
|
|
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));
|
2013-03-22 11:19:48 +00:00
|
|
|
goto out;
|
2015-07-02 13:15:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!sshkey_equal_public(cert, public))
|
2013-03-22 11:19:48 +00:00
|
|
|
fatal("Certificate %s does not match private key %s",
|
|
|
|
certpath, filename);
|
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
if ((r = ssh_remove_identity(agent_fd, cert)) == 0) {
|
2013-03-22 11:19:48 +00:00
|
|
|
fprintf(stderr, "Identity removed: %s (%s)\n", certpath,
|
|
|
|
comment);
|
|
|
|
ret = 0;
|
|
|
|
} else
|
2015-07-02 13:15:34 +00:00
|
|
|
fprintf(stderr, "Could not remove identity \"%s\": %s\n",
|
|
|
|
certpath, ssh_err(r));
|
2013-03-22 11:19:48 +00:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (cert != NULL)
|
2015-07-02 13:15:34 +00:00
|
|
|
sshkey_free(cert);
|
2013-03-22 11:19:48 +00:00
|
|
|
if (public != NULL)
|
2015-07-02 13:15:34 +00:00
|
|
|
sshkey_free(public);
|
2013-03-22 11:19:48 +00:00
|
|
|
free(certpath);
|
|
|
|
free(comment);
|
2002-03-18 09:55:03 +00:00
|
|
|
|
|
|
|
return ret;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2000-09-10 08:31:17 +00:00
|
|
|
/* Send a request to remove all identities. */
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
delete_all(int agent_fd)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2002-03-18 09:55:03 +00:00
|
|
|
int ret = -1;
|
2000-09-10 08:31:17 +00:00
|
|
|
|
2015-07-02 13:18:50 +00:00
|
|
|
if (ssh_remove_all_identities(agent_fd, 2) == 0)
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 0;
|
2015-07-02 13:18:50 +00:00
|
|
|
/* ignore error-code for ssh1 */
|
|
|
|
ssh_remove_all_identities(agent_fd, 1);
|
2000-09-10 08:31:17 +00:00
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
if (ret == 0)
|
2000-02-24 14:29:47 +00:00
|
|
|
fprintf(stderr, "All identities removed.\n");
|
|
|
|
else
|
2001-05-04 03:57:05 +00:00
|
|
|
fprintf(stderr, "Failed to remove all identities.\n");
|
2002-03-18 09:55:03 +00:00
|
|
|
|
|
|
|
return ret;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
add_file(int agent_fd, const char *filename, int key_only)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2015-07-02 13:15:34 +00:00
|
|
|
struct sshkey *private, *cert;
|
2001-05-04 03:57:05 +00:00
|
|
|
char *comment = NULL;
|
2012-08-29 15:46:01 +00:00
|
|
|
char msg[1024], *certpath = NULL;
|
2015-07-02 13:15:34 +00:00
|
|
|
int r, fd, ret = -1;
|
|
|
|
struct sshbuf *keyblob;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2011-09-28 08:14:41 +00:00
|
|
|
if (strcmp(filename, "-") == 0) {
|
|
|
|
fd = STDIN_FILENO;
|
|
|
|
filename = "(stdin)";
|
|
|
|
} else if ((fd = open(filename, O_RDONLY)) < 0) {
|
2000-09-10 08:31:17 +00:00
|
|
|
perror(filename);
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
2000-09-10 08:31:17 +00:00
|
|
|
}
|
2006-09-30 13:29:51 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Since we'll try to load a keyfile multiple times, permission errors
|
|
|
|
* will occur multiple times, so check perms first and bail if wrong.
|
|
|
|
*/
|
2011-09-28 08:14:41 +00:00
|
|
|
if (fd != STDIN_FILENO) {
|
2015-07-02 13:15:34 +00:00
|
|
|
if (sshkey_perm_ok(fd, filename) != 0) {
|
2011-09-28 08:14:41 +00:00
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
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);
|
2011-09-28 08:14:41 +00:00
|
|
|
close(fd);
|
2006-09-30 13:29:51 +00:00
|
|
|
return -1;
|
2011-09-28 08:14:41 +00:00
|
|
|
}
|
|
|
|
close(fd);
|
2006-09-30 13:29:51 +00:00
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
/* At first, try empty passphrase */
|
2015-07-02 13:15:34 +00:00
|
|
|
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;
|
|
|
|
}
|
2015-01-05 16:09:55 +00:00
|
|
|
/* try last */
|
|
|
|
if (private == NULL && pass != NULL) {
|
2015-07-02 13:15:34 +00:00
|
|
|
if ((r = sshkey_parse_private_fileblob(keyblob, pass, filename,
|
2015-01-05 16:09:55 +00:00
|
|
|
&private, &comment)) != 0 &&
|
2015-07-02 13:15:34 +00:00
|
|
|
r != SSH_ERR_KEY_WRONG_PASSPHRASE) {
|
|
|
|
fprintf(stderr, "Error loading key \"%s\": %s\n",
|
|
|
|
filename, ssh_err(r));
|
|
|
|
goto fail_load;
|
|
|
|
}
|
2015-01-05 16:09:55 +00:00
|
|
|
}
|
2001-05-04 03:57:05 +00:00
|
|
|
if (comment == NULL)
|
|
|
|
comment = xstrdup(filename);
|
|
|
|
if (private == NULL) {
|
|
|
|
/* clear passphrase since it did not work */
|
|
|
|
clear_pass();
|
2015-07-02 13:15:34 +00:00
|
|
|
snprintf(msg, sizeof msg, "Enter passphrase for %.200s%s: ",
|
|
|
|
comment, confirm ? " (will confirm each use)" : "");
|
2000-02-24 14:29:47 +00:00
|
|
|
for (;;) {
|
2002-03-18 09:55:03 +00:00
|
|
|
pass = read_passphrase(msg, RP_ALLOW_STDIN);
|
2015-07-02 13:15:34 +00:00
|
|
|
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:
|
2001-05-04 03:57:05 +00:00
|
|
|
clear_pass();
|
2013-09-18 17:27:38 +00:00
|
|
|
free(comment);
|
2015-07-02 13:15:34 +00:00
|
|
|
sshbuf_free(keyblob);
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2001-05-04 03:57:05 +00:00
|
|
|
clear_pass();
|
2004-01-07 11:10:17 +00:00
|
|
|
snprintf(msg, sizeof msg,
|
2015-07-02 13:15:34 +00:00
|
|
|
"Bad passphrase, try again for %.200s%s: ", comment,
|
|
|
|
confirm ? " (will confirm each use)" : "");
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
sshbuf_free(keyblob);
|
2002-06-23 14:01:54 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
if ((r = ssh_add_identity_constrained(agent_fd, private, comment,
|
|
|
|
lifetime, confirm)) == 0) {
|
2001-05-04 03:57:05 +00:00
|
|
|
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 0;
|
2002-06-23 14:01:54 +00:00
|
|
|
if (lifetime != 0)
|
2003-04-23 16:53:02 +00:00
|
|
|
fprintf(stderr,
|
2002-06-23 14:01:54 +00:00
|
|
|
"Lifetime set to %d seconds\n", lifetime);
|
2004-02-26 10:38:49 +00:00
|
|
|
if (confirm != 0)
|
2003-04-23 16:53:02 +00:00
|
|
|
fprintf(stderr,
|
2010-11-08 10:45:44 +00:00
|
|
|
"The user must confirm each use of the key\n");
|
2002-06-23 14:01:54 +00:00
|
|
|
} else {
|
2015-07-02 13:15:34 +00:00
|
|
|
fprintf(stderr, "Could not add identity \"%s\": %s\n",
|
|
|
|
filename, ssh_err(r));
|
2002-06-23 14:01:54 +00:00
|
|
|
}
|
2002-03-18 09:55:03 +00:00
|
|
|
|
2012-08-29 15:46:01 +00:00
|
|
|
/* Skip trying to load the cert if requested */
|
|
|
|
if (key_only)
|
|
|
|
goto out;
|
2010-03-08 11:19:52 +00:00
|
|
|
|
|
|
|
/* Now try to add the certificate flavour too */
|
|
|
|
xasprintf(&certpath, "%s-cert.pub", filename);
|
2015-07-02 13:15:34 +00:00
|
|
|
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));
|
2010-11-08 10:45:44 +00:00
|
|
|
goto out;
|
2015-07-02 13:15:34 +00:00
|
|
|
}
|
2010-11-08 10:45:44 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
if (!sshkey_equal_public(cert, private)) {
|
2010-11-08 10:45:44 +00:00
|
|
|
error("Certificate %s does not match private key %s",
|
|
|
|
certpath, filename);
|
2015-07-02 13:15:34 +00:00
|
|
|
sshkey_free(cert);
|
2010-11-08 10:45:44 +00:00
|
|
|
goto out;
|
|
|
|
}
|
2010-03-08 11:19:52 +00:00
|
|
|
|
2010-11-08 10:45:44 +00:00
|
|
|
/* Graft with private bits */
|
2015-07-02 13:15:34 +00:00
|
|
|
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);
|
2010-11-08 10:45:44 +00:00
|
|
|
goto out;
|
2010-03-08 11:19:52 +00:00
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
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);
|
2010-03-08 11:19:52 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
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;
|
2010-11-08 10:45:44 +00:00
|
|
|
}
|
|
|
|
fprintf(stderr, "Certificate added: %s (%s)\n", certpath,
|
|
|
|
private->cert->key_id);
|
|
|
|
if (lifetime != 0)
|
|
|
|
fprintf(stderr, "Lifetime set to %d seconds\n", lifetime);
|
|
|
|
if (confirm != 0)
|
|
|
|
fprintf(stderr, "The user must confirm each use of the key\n");
|
|
|
|
out:
|
2015-07-02 13:15:34 +00:00
|
|
|
free(certpath);
|
2013-09-18 17:27:38 +00:00
|
|
|
free(comment);
|
2015-07-02 13:15:34 +00:00
|
|
|
sshkey_free(private);
|
2002-03-18 09:55:03 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
update_card(int agent_fd, int add, const char *id)
|
2002-03-18 09:55:03 +00:00
|
|
|
{
|
2014-01-30 10:56:49 +00:00
|
|
|
char *pin = NULL;
|
2015-07-02 13:15:34 +00:00
|
|
|
int r, ret = -1;
|
2002-06-23 14:01:54 +00:00
|
|
|
|
2014-01-30 10:56:49 +00:00
|
|
|
if (add) {
|
|
|
|
if ((pin = read_passphrase("Enter passphrase for PKCS#11: ",
|
|
|
|
RP_ALLOW_STDIN)) == NULL)
|
|
|
|
return -1;
|
|
|
|
}
|
2002-06-23 14:01:54 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
if ((r = ssh_update_card(agent_fd, add, id, pin == NULL ? "" : pin,
|
|
|
|
lifetime, confirm)) == 0) {
|
2002-03-18 09:55:03 +00:00
|
|
|
fprintf(stderr, "Card %s: %s\n",
|
|
|
|
add ? "added" : "removed", id);
|
2003-04-23 16:53:02 +00:00
|
|
|
ret = 0;
|
2002-03-18 09:55:03 +00:00
|
|
|
} else {
|
2015-07-02 13:15:34 +00:00
|
|
|
fprintf(stderr, "Could not %s card \"%s\": %s\n",
|
|
|
|
add ? "add" : "remove", id, ssh_err(r));
|
2003-04-23 16:53:02 +00:00
|
|
|
ret = -1;
|
2002-03-18 09:55:03 +00:00
|
|
|
}
|
2013-09-18 17:27:38 +00:00
|
|
|
free(pin);
|
2003-04-23 16:53:02 +00:00
|
|
|
return ret;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
list_identities(int agent_fd, int do_fp)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2015-07-02 13:15:34 +00:00
|
|
|
char *fp;
|
2015-07-02 13:18:50 +00:00
|
|
|
int r, had_identities = 0;
|
2015-07-02 13:15:34 +00:00
|
|
|
struct ssh_identitylist *idlist;
|
|
|
|
size_t i;
|
2015-07-02 13:18:50 +00:00
|
|
|
#ifdef WITH_SSH1
|
|
|
|
int version = 1;
|
|
|
|
#else
|
|
|
|
int version = 2;
|
|
|
|
#endif
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2015-07-02 13:18:50 +00:00
|
|
|
for (; version <= 2; version++) {
|
2015-07-02 13:15:34 +00:00
|
|
|
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++) {
|
2000-09-10 08:31:17 +00:00
|
|
|
had_identities = 1;
|
2001-05-04 03:57:05 +00:00
|
|
|
if (do_fp) {
|
2015-07-02 13:15:34 +00:00
|
|
|
fp = sshkey_fingerprint(idlist->keys[i],
|
|
|
|
fingerprint_hash, SSH_FP_DEFAULT);
|
2001-05-04 03:57:05 +00:00
|
|
|
printf("%d %s %s (%s)\n",
|
2015-07-02 13:15:34 +00:00
|
|
|
sshkey_size(idlist->keys[i]),
|
|
|
|
fp == NULL ? "(null)" : fp,
|
|
|
|
idlist->comments[i],
|
|
|
|
sshkey_type(idlist->keys[i]));
|
2013-09-18 17:27:38 +00:00
|
|
|
free(fp);
|
2000-02-24 14:29:47 +00:00
|
|
|
} else {
|
2015-07-02 13:15:34 +00:00
|
|
|
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]);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
ssh_free_identitylist(idlist);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2002-03-18 09:55:03 +00:00
|
|
|
if (!had_identities) {
|
2000-02-24 14:29:47 +00:00
|
|
|
printf("The agent has no identities.\n");
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2002-06-23 14:01:54 +00:00
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
lock_agent(int agent_fd, int lock)
|
2002-06-23 14:01:54 +00:00
|
|
|
{
|
|
|
|
char prompt[100], *p1, *p2;
|
2015-07-02 13:15:34 +00:00
|
|
|
int r, passok = 1, ret = -1;
|
2002-06-23 14:01:54 +00:00
|
|
|
|
|
|
|
strlcpy(prompt, "Enter lock password: ", sizeof(prompt));
|
|
|
|
p1 = read_passphrase(prompt, RP_ALLOW_STDIN);
|
|
|
|
if (lock) {
|
|
|
|
strlcpy(prompt, "Again: ", sizeof prompt);
|
|
|
|
p2 = read_passphrase(prompt, RP_ALLOW_STDIN);
|
|
|
|
if (strcmp(p1, p2) != 0) {
|
|
|
|
fprintf(stderr, "Passwords do not match.\n");
|
|
|
|
passok = 0;
|
|
|
|
}
|
2014-03-22 15:23:38 +00:00
|
|
|
explicit_bzero(p2, strlen(p2));
|
2013-09-18 17:27:38 +00:00
|
|
|
free(p2);
|
2002-06-23 14:01:54 +00:00
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
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));
|
|
|
|
}
|
|
|
|
}
|
2014-03-22 15:23:38 +00:00
|
|
|
explicit_bzero(p1, strlen(p1));
|
2013-09-18 17:27:38 +00:00
|
|
|
free(p1);
|
2002-10-29 09:43:00 +00:00
|
|
|
return (ret);
|
2002-06-23 14:01:54 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2015-07-02 13:15:34 +00:00
|
|
|
do_file(int agent_fd, int deleting, int key_only, char *file)
|
2002-03-18 09:55:03 +00:00
|
|
|
{
|
|
|
|
if (deleting) {
|
2015-07-02 13:15:34 +00:00
|
|
|
if (delete_file(agent_fd, file, key_only) == -1)
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
|
|
|
} else {
|
2015-07-02 13:15:34 +00:00
|
|
|
if (add_file(agent_fd, file, key_only) == -1)
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
usage(void)
|
|
|
|
{
|
2008-07-23 09:28:49 +00:00
|
|
|
fprintf(stderr, "usage: %s [options] [file ...]\n", __progname);
|
2002-03-18 09:55:03 +00:00
|
|
|
fprintf(stderr, "Options:\n");
|
|
|
|
fprintf(stderr, " -l List fingerprints of all identities.\n");
|
2015-07-02 13:15:34 +00:00
|
|
|
fprintf(stderr, " -E hash Specify hash algorithm used for fingerprints.\n");
|
2002-03-18 09:55:03 +00:00
|
|
|
fprintf(stderr, " -L List public key parameters of all identities.\n");
|
2012-08-29 15:46:01 +00:00
|
|
|
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");
|
2002-03-18 09:55:03 +00:00
|
|
|
fprintf(stderr, " -d Delete identity.\n");
|
|
|
|
fprintf(stderr, " -D Delete all identities.\n");
|
2002-06-23 14:01:54 +00:00
|
|
|
fprintf(stderr, " -x Lock agent.\n");
|
2002-10-29 09:43:00 +00:00
|
|
|
fprintf(stderr, " -X Unlock agent.\n");
|
2010-03-08 11:19:52 +00:00
|
|
|
fprintf(stderr, " -s pkcs11 Add keys from PKCS#11 provider.\n");
|
|
|
|
fprintf(stderr, " -e pkcs11 Remove keys provided by PKCS#11 provider.\n");
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
main(int argc, char **argv)
|
|
|
|
{
|
2002-03-18 09:55:03 +00:00
|
|
|
extern char *optarg;
|
|
|
|
extern int optind;
|
2015-07-02 13:15:34 +00:00
|
|
|
int agent_fd;
|
2010-03-08 11:19:52 +00:00
|
|
|
char *pkcs11provider = NULL;
|
2015-07-02 13:15:34 +00:00
|
|
|
int r, i, ch, deleting = 0, ret = 0, key_only = 0;
|
|
|
|
int xflag = 0, lflag = 0, Dflag = 0;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2006-03-22 19:46:12 +00:00
|
|
|
/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
|
|
|
|
sanitise_stdfd();
|
|
|
|
|
2004-01-07 11:10:17 +00:00
|
|
|
__progname = ssh_get_progname(argv[0]);
|
2002-06-27 22:31:32 +00:00
|
|
|
seed_rng();
|
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
#ifdef WITH_OPENSSL
|
2011-02-17 11:47:40 +00:00
|
|
|
OpenSSL_add_all_algorithms();
|
2015-07-02 13:15:34 +00:00
|
|
|
#endif
|
2000-09-10 08:31:17 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
setvbuf(stdout, NULL, _IOLBF, 0);
|
2015-01-05 16:09:55 +00:00
|
|
|
|
2015-07-02 13:15:34 +00:00
|
|
|
/* 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));
|
2002-03-18 09:55:03 +00:00
|
|
|
exit(2);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
|
|
|
|
while ((ch = getopt(argc, argv, "klLcdDxXE:e:s:t:")) != -1) {
|
2002-03-18 09:55:03 +00:00
|
|
|
switch (ch) {
|
2015-07-02 13:15:34 +00:00
|
|
|
case 'E':
|
|
|
|
fingerprint_hash = ssh_digest_alg_by_name(optarg);
|
|
|
|
if (fingerprint_hash == -1)
|
|
|
|
fatal("Invalid hash algorithm \"%s\"", optarg);
|
|
|
|
break;
|
2012-08-29 15:46:01 +00:00
|
|
|
case 'k':
|
|
|
|
key_only = 1;
|
|
|
|
break;
|
2002-03-18 09:55:03 +00:00
|
|
|
case 'l':
|
|
|
|
case 'L':
|
2015-07-02 13:15:34 +00:00
|
|
|
if (lflag != 0)
|
|
|
|
fatal("-%c flag already specified", lflag);
|
|
|
|
lflag = ch;
|
|
|
|
break;
|
2002-06-23 14:01:54 +00:00
|
|
|
case 'x':
|
|
|
|
case 'X':
|
2015-07-02 13:15:34 +00:00
|
|
|
if (xflag != 0)
|
|
|
|
fatal("-%c flag already specified", xflag);
|
|
|
|
xflag = ch;
|
|
|
|
break;
|
2003-04-23 16:53:02 +00:00
|
|
|
case 'c':
|
|
|
|
confirm = 1;
|
|
|
|
break;
|
2002-03-18 09:55:03 +00:00
|
|
|
case 'd':
|
2000-02-24 14:29:47 +00:00
|
|
|
deleting = 1;
|
2002-03-18 09:55:03 +00:00
|
|
|
break;
|
|
|
|
case 'D':
|
2015-07-02 13:15:34 +00:00
|
|
|
Dflag = 1;
|
|
|
|
break;
|
2002-03-18 09:55:03 +00:00
|
|
|
case 's':
|
2010-03-08 11:19:52 +00:00
|
|
|
pkcs11provider = optarg;
|
2002-03-18 09:55:03 +00:00
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
deleting = 1;
|
2010-03-08 11:19:52 +00:00
|
|
|
pkcs11provider = optarg;
|
2002-03-18 09:55:03 +00:00
|
|
|
break;
|
2002-06-23 14:01:54 +00:00
|
|
|
case 't':
|
|
|
|
if ((lifetime = convtime(optarg)) == -1) {
|
|
|
|
fprintf(stderr, "Invalid lifetime\n");
|
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
break;
|
2002-03-18 09:55:03 +00:00
|
|
|
default:
|
|
|
|
usage();
|
|
|
|
ret = 1;
|
|
|
|
goto done;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-02 13:15:34 +00:00
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
argc -= optind;
|
|
|
|
argv += optind;
|
2010-03-08 11:19:52 +00:00
|
|
|
if (pkcs11provider != NULL) {
|
2015-07-02 13:15:34 +00:00
|
|
|
if (update_card(agent_fd, !deleting, pkcs11provider) == -1)
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (argc == 0) {
|
2015-07-02 13:15:34 +00:00
|
|
|
char buf[PATH_MAX];
|
2002-03-18 09:55:03 +00:00
|
|
|
struct passwd *pw;
|
2002-06-23 14:01:54 +00:00
|
|
|
struct stat st;
|
|
|
|
int count = 0;
|
2002-03-18 09:55:03 +00:00
|
|
|
|
|
|
|
if ((pw = getpwuid(getuid())) == NULL) {
|
2000-09-10 08:31:17 +00:00
|
|
|
fprintf(stderr, "No user found with uid %u\n",
|
|
|
|
(u_int)getuid());
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2005-06-05 15:41:57 +00:00
|
|
|
for (i = 0; default_files[i]; i++) {
|
2002-06-23 14:01:54 +00:00
|
|
|
snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
|
2002-03-18 09:55:03 +00:00
|
|
|
default_files[i]);
|
2002-06-23 14:01:54 +00:00
|
|
|
if (stat(buf, &st) < 0)
|
|
|
|
continue;
|
2015-07-02 13:15:34 +00:00
|
|
|
if (do_file(agent_fd, deleting, key_only, buf) == -1)
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 1;
|
2002-06-23 14:01:54 +00:00
|
|
|
else
|
|
|
|
count++;
|
2002-03-18 09:55:03 +00:00
|
|
|
}
|
2002-06-23 14:01:54 +00:00
|
|
|
if (count == 0)
|
|
|
|
ret = 1;
|
2002-03-18 09:55:03 +00:00
|
|
|
} else {
|
2005-06-05 15:41:57 +00:00
|
|
|
for (i = 0; i < argc; i++) {
|
2015-07-02 13:15:34 +00:00
|
|
|
if (do_file(agent_fd, deleting, key_only,
|
|
|
|
argv[i]) == -1)
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 1;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
}
|
2001-05-04 03:57:05 +00:00
|
|
|
clear_pass();
|
2002-03-18 09:55:03 +00:00
|
|
|
|
|
|
|
done:
|
2015-07-02 13:15:34 +00:00
|
|
|
ssh_close_authentication_socket(agent_fd);
|
2002-03-18 09:55:03 +00:00
|
|
|
return ret;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|