2012-08-29 15:46:01 +00:00
|
|
|
/* $OpenBSD: ssh-add.c,v 1.103 2011/10/18 23:37:42 djm 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>
|
|
|
|
#include <sys/param.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
|
|
|
|
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>
|
|
|
|
|
|
|
|
#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"
|
2000-05-15 04:37:24 +00:00
|
|
|
#include "key.h"
|
2006-09-30 13:29:51 +00:00
|
|
|
#include "buffer.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"
|
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[] = {
|
|
|
|
_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
|
2002-06-23 14:01:54 +00:00
|
|
|
_PATH_SSH_CLIENT_IDENTITY,
|
2002-03-18 09:55:03 +00:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
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) {
|
|
|
|
memset(pass, 0, strlen(pass));
|
|
|
|
xfree(pass);
|
|
|
|
pass = NULL;
|
|
|
|
}
|
|
|
|
}
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2000-02-24 14:29:47 +00:00
|
|
|
delete_file(AuthenticationConnection *ac, const char *filename)
|
|
|
|
{
|
2000-05-15 04:37:24 +00:00
|
|
|
Key *public;
|
2001-05-04 03:57:05 +00:00
|
|
|
char *comment = NULL;
|
2002-03-18 09:55:03 +00:00
|
|
|
int ret = -1;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2001-05-04 03:57:05 +00:00
|
|
|
public = key_load_public(filename, &comment);
|
|
|
|
if (public == NULL) {
|
|
|
|
printf("Bad key file %s\n", filename);
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2002-03-18 09:55:03 +00:00
|
|
|
if (ssh_remove_identity(ac, public)) {
|
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
|
2000-02-24 14:29:47 +00:00
|
|
|
fprintf(stderr, "Could not remove identity: %s\n", filename);
|
2002-03-18 09:55:03 +00:00
|
|
|
|
2000-05-15 04:37:24 +00:00
|
|
|
key_free(public);
|
2000-02-24 14:29:47 +00:00
|
|
|
xfree(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
|
2000-02-24 14:29:47 +00:00
|
|
|
delete_all(AuthenticationConnection *ac)
|
|
|
|
{
|
2002-03-18 09:55:03 +00:00
|
|
|
int ret = -1;
|
2000-09-10 08:31:17 +00:00
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
if (ssh_remove_all_identities(ac, 1))
|
|
|
|
ret = 0;
|
2000-09-10 08:31:17 +00:00
|
|
|
/* ignore error-code for ssh2 */
|
|
|
|
ssh_remove_all_identities(ac, 2);
|
|
|
|
|
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
|
2012-08-29 15:46:01 +00:00
|
|
|
add_file(AuthenticationConnection *ac, const char *filename, int key_only)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2010-03-08 11:19:52 +00:00
|
|
|
Key *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;
|
2006-09-30 13:29:51 +00:00
|
|
|
int fd, perms_ok, ret = -1;
|
2011-09-28 08:14:41 +00:00
|
|
|
Buffer 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) {
|
|
|
|
perms_ok = key_perm_ok(fd, filename);
|
|
|
|
if (!perms_ok) {
|
|
|
|
close(fd);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buffer_init(&keyblob);
|
|
|
|
if (!key_load_file(fd, filename, &keyblob)) {
|
|
|
|
buffer_free(&keyblob);
|
|
|
|
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 */
|
2011-09-28 08:14:41 +00:00
|
|
|
private = key_parse_private(&keyblob, filename, "", &comment);
|
2001-05-04 03:57:05 +00:00
|
|
|
if (comment == NULL)
|
|
|
|
comment = xstrdup(filename);
|
|
|
|
/* try last */
|
|
|
|
if (private == NULL && pass != NULL)
|
2011-09-28 08:14:41 +00:00
|
|
|
private = key_parse_private(&keyblob, filename, pass, NULL);
|
2001-05-04 03:57:05 +00:00
|
|
|
if (private == NULL) {
|
|
|
|
/* clear passphrase since it did not work */
|
|
|
|
clear_pass();
|
2002-03-18 09:55:03 +00:00
|
|
|
snprintf(msg, sizeof msg, "Enter passphrase for %.200s: ",
|
2005-09-03 06:59:33 +00:00
|
|
|
comment);
|
2000-02-24 14:29:47 +00:00
|
|
|
for (;;) {
|
2002-03-18 09:55:03 +00:00
|
|
|
pass = read_passphrase(msg, RP_ALLOW_STDIN);
|
2000-02-24 14:29:47 +00:00
|
|
|
if (strcmp(pass, "") == 0) {
|
2001-05-04 03:57:05 +00:00
|
|
|
clear_pass();
|
|
|
|
xfree(comment);
|
2011-09-28 08:14:41 +00:00
|
|
|
buffer_free(&keyblob);
|
2002-03-18 09:55:03 +00:00
|
|
|
return -1;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2011-09-28 08:14:41 +00:00
|
|
|
private = key_parse_private(&keyblob, filename, pass,
|
|
|
|
&comment);
|
2001-05-04 03:57:05 +00:00
|
|
|
if (private != NULL)
|
2000-02-24 14:29:47 +00:00
|
|
|
break;
|
2001-05-04 03:57:05 +00:00
|
|
|
clear_pass();
|
2004-01-07 11:10:17 +00:00
|
|
|
snprintf(msg, sizeof msg,
|
|
|
|
"Bad passphrase, try again for %.200s: ", comment);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
}
|
2011-09-28 08:14:41 +00:00
|
|
|
buffer_free(&keyblob);
|
2002-06-23 14:01:54 +00:00
|
|
|
|
2004-02-26 10:38:49 +00:00
|
|
|
if (ssh_add_identity_constrained(ac, private, comment, lifetime,
|
|
|
|
confirm)) {
|
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 {
|
2000-02-24 14:29:47 +00:00
|
|
|
fprintf(stderr, "Could not add identity: %s\n", filename);
|
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);
|
2010-11-08 10:45:44 +00:00
|
|
|
if ((cert = key_load_public(certpath, NULL)) == NULL)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (!key_equal_public(cert, private)) {
|
|
|
|
error("Certificate %s does not match private key %s",
|
|
|
|
certpath, filename);
|
2010-03-08 11:19:52 +00:00
|
|
|
key_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 */
|
|
|
|
if (key_to_certified(private, key_cert_is_legacy(cert)) != 0) {
|
|
|
|
error("%s: key_to_certified failed", __func__);
|
|
|
|
key_free(cert);
|
|
|
|
goto out;
|
2010-03-08 11:19:52 +00:00
|
|
|
}
|
2010-11-08 10:45:44 +00:00
|
|
|
key_cert_copy(cert, private);
|
|
|
|
key_free(cert);
|
2010-03-08 11:19:52 +00:00
|
|
|
|
2010-11-08 10:45:44 +00:00
|
|
|
if (!ssh_add_identity_constrained(ac, private, comment,
|
|
|
|
lifetime, confirm)) {
|
|
|
|
error("Certificate %s (%s) add failed", certpath,
|
|
|
|
private->cert->key_id);
|
|
|
|
}
|
|
|
|
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:
|
2012-08-29 15:46:01 +00:00
|
|
|
if (certpath != NULL)
|
|
|
|
xfree(certpath);
|
2001-05-04 03:57:05 +00:00
|
|
|
xfree(comment);
|
2000-05-15 04:37:24 +00:00
|
|
|
key_free(private);
|
2002-03-18 09:55:03 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
update_card(AuthenticationConnection *ac, int add, const char *id)
|
|
|
|
{
|
2002-06-23 14:01:54 +00:00
|
|
|
char *pin;
|
2003-04-23 16:53:02 +00:00
|
|
|
int ret = -1;
|
2002-06-23 14:01:54 +00:00
|
|
|
|
2010-03-08 11:19:52 +00:00
|
|
|
pin = read_passphrase("Enter passphrase for PKCS#11: ", RP_ALLOW_STDIN);
|
2002-06-23 14:01:54 +00:00
|
|
|
if (pin == NULL)
|
|
|
|
return -1;
|
|
|
|
|
2004-01-07 11:10:17 +00:00
|
|
|
if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
|
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 {
|
|
|
|
fprintf(stderr, "Could not %s card: %s\n",
|
|
|
|
add ? "add" : "remove", id);
|
2003-04-23 16:53:02 +00:00
|
|
|
ret = -1;
|
2002-03-18 09:55:03 +00:00
|
|
|
}
|
2003-04-23 16:53:02 +00:00
|
|
|
xfree(pin);
|
|
|
|
return ret;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
|
|
|
|
2002-03-18 09:55:03 +00:00
|
|
|
static int
|
2001-05-04 03:57:05 +00:00
|
|
|
list_identities(AuthenticationConnection *ac, int do_fp)
|
2000-02-24 14:29:47 +00:00
|
|
|
{
|
2000-09-10 08:31:17 +00:00
|
|
|
Key *key;
|
2001-05-04 03:57:05 +00:00
|
|
|
char *comment, *fp;
|
2000-09-10 08:31:17 +00:00
|
|
|
int had_identities = 0;
|
|
|
|
int version;
|
2000-02-24 14:29:47 +00:00
|
|
|
|
2000-09-10 08:31:17 +00:00
|
|
|
for (version = 1; version <= 2; version++) {
|
|
|
|
for (key = ssh_get_first_identity(ac, &comment, version);
|
2002-03-18 09:55:03 +00:00
|
|
|
key != NULL;
|
|
|
|
key = ssh_get_next_identity(ac, &comment, version)) {
|
2000-09-10 08:31:17 +00:00
|
|
|
had_identities = 1;
|
2001-05-04 03:57:05 +00:00
|
|
|
if (do_fp) {
|
|
|
|
fp = key_fingerprint(key, SSH_FP_MD5,
|
|
|
|
SSH_FP_HEX);
|
|
|
|
printf("%d %s %s (%s)\n",
|
|
|
|
key_size(key), fp, comment, key_type(key));
|
|
|
|
xfree(fp);
|
2000-02-24 14:29:47 +00:00
|
|
|
} else {
|
2000-09-10 08:31:17 +00:00
|
|
|
if (!key_write(key, stdout))
|
|
|
|
fprintf(stderr, "key_write failed");
|
|
|
|
fprintf(stdout, " %s\n", comment);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2000-09-10 08:31:17 +00:00
|
|
|
key_free(key);
|
|
|
|
xfree(comment);
|
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
|
|
|
|
lock_agent(AuthenticationConnection *ac, int lock)
|
|
|
|
{
|
|
|
|
char prompt[100], *p1, *p2;
|
|
|
|
int passok = 1, ret = -1;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
memset(p2, 0, strlen(p2));
|
|
|
|
xfree(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);
|
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
|
2012-08-29 15:46:01 +00:00
|
|
|
do_file(AuthenticationConnection *ac, int deleting, int key_only, char *file)
|
2002-03-18 09:55:03 +00:00
|
|
|
{
|
|
|
|
if (deleting) {
|
|
|
|
if (delete_file(ac, file) == -1)
|
|
|
|
return -1;
|
|
|
|
} else {
|
2012-08-29 15:46:01 +00:00
|
|
|
if (add_file(ac, 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");
|
|
|
|
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;
|
2000-02-24 14:29:47 +00:00
|
|
|
AuthenticationConnection *ac = NULL;
|
2010-03-08 11:19:52 +00:00
|
|
|
char *pkcs11provider = NULL;
|
2012-08-29 15:46:01 +00:00
|
|
|
int i, ch, deleting = 0, ret = 0, key_only = 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();
|
|
|
|
|
2011-02-17 11:47:40 +00:00
|
|
|
OpenSSL_add_all_algorithms();
|
2000-09-10 08:31:17 +00:00
|
|
|
|
2000-02-24 14:29:47 +00:00
|
|
|
/* At first, get a connection to the authentication agent. */
|
|
|
|
ac = ssh_get_authentication_connection();
|
|
|
|
if (ac == NULL) {
|
2006-03-22 19:46:12 +00:00
|
|
|
fprintf(stderr,
|
|
|
|
"Could not open a connection to your authentication agent.\n");
|
2002-03-18 09:55:03 +00:00
|
|
|
exit(2);
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|
2012-08-29 15:46:01 +00:00
|
|
|
while ((ch = getopt(argc, argv, "klLcdDxXe:s:t:")) != -1) {
|
2002-03-18 09:55:03 +00:00
|
|
|
switch (ch) {
|
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':
|
|
|
|
if (list_identities(ac, ch == 'l' ? 1 : 0) == -1)
|
|
|
|
ret = 1;
|
|
|
|
goto done;
|
2002-06-23 14:01:54 +00:00
|
|
|
case 'x':
|
|
|
|
case 'X':
|
|
|
|
if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
|
|
|
|
ret = 1;
|
|
|
|
goto done;
|
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':
|
|
|
|
if (delete_all(ac) == -1)
|
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
2002-03-18 09:55:03 +00:00
|
|
|
argc -= optind;
|
|
|
|
argv += optind;
|
2010-03-08 11:19:52 +00:00
|
|
|
if (pkcs11provider != NULL) {
|
|
|
|
if (update_card(ac, !deleting, pkcs11provider) == -1)
|
2002-03-18 09:55:03 +00:00
|
|
|
ret = 1;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (argc == 0) {
|
|
|
|
char buf[MAXPATHLEN];
|
|
|
|
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;
|
2012-08-29 15:46:01 +00:00
|
|
|
if (do_file(ac, 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++) {
|
2012-08-29 15:46:01 +00:00
|
|
|
if (do_file(ac, 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:
|
2000-02-24 14:29:47 +00:00
|
|
|
ssh_close_authentication_connection(ac);
|
2002-03-18 09:55:03 +00:00
|
|
|
return ret;
|
2000-02-24 14:29:47 +00:00
|
|
|
}
|