summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-07-04 03:50:02 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-07-04 03:50:02 +0000
commit036a6b28c9ef5a237e2fbd7d73ca94af3d24e897 (patch)
tree3968210d82563cc98a092737e5028319e4833d07 /ssh-add.c
parentd94580c708175649f4e433451ac096425d3b81e2 (diff)
- markus@cvs.openbsd.org 2001/06/26 04:59:59
[authfd.c authfd.h ssh-add.c] initial support for smartcards in the agent
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c52
1 files changed, 51 insertions, 1 deletions
diff --git a/ssh-add.c b/ssh-add.c
index d6a55446..dad8beb4 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.41 2001/06/25 08:25:40 markus Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.42 2001/06/26 04:59:59 markus Exp $");
#include <openssl/evp.h>
@@ -150,6 +150,17 @@ add_file(AuthenticationConnection *ac, const char *filename)
}
static void
+update_card(AuthenticationConnection *ac, int add, int id)
+{
+ if (ssh_update_card(ac, add, id))
+ fprintf(stderr, "Card %s: %d\n",
+ add ? "added" : "removed", id);
+ else
+ fprintf(stderr, "Could not %s card: %d\n",
+ add ? "add" : "remove", id);
+}
+
+static void
list_identities(AuthenticationConnection *ac, int do_fp)
{
Key *key;
@@ -181,6 +192,18 @@ list_identities(AuthenticationConnection *ac, int do_fp)
printf("The agent has no identities.\n");
}
+static void
+usage(void)
+{
+ printf("Usage: ssh-add [options]\n");
+ printf(" -l, -L : list identities\n");
+ printf(" -d : delete identity\n");
+ printf(" -D : delete all identities\n");
+ printf(" -s reader_num : add key in the smartcard in reader_num.\n");
+ printf(" -e reader_num : remove key in the smartcard in reader_num.\n");
+ exit (1);
+}
+
int
main(int argc, char **argv)
{
@@ -190,6 +213,8 @@ main(int argc, char **argv)
int no_files = 1;
int i;
int deleting = 0;
+ int sc_mode = 0;
+ int sc_reader_num = 0;
__progname = get_progname(argv[0]);
init_rng();
@@ -220,12 +245,37 @@ main(int argc, char **argv)
no_files = 0;
continue;
}
+ if (strcmp(argv[i], "-s") == 0) {
+ sc_mode = 1;
+ deleting = 0;
+ i++;
+ if (i >= argc)
+ usage();
+ sc_reader_num = atoi(argv[i]);
+ continue;
+ }
+ if (strcmp(argv[i], "-e") == 0) {
+ sc_mode = 1;
+ deleting = 1;
+ i++;
+ if (i >= argc)
+ usage();
+ sc_reader_num = atoi(argv[i]);
+ continue;
+ }
+ if (sc_mode == 1)
+ update_card(ac, !deleting, sc_reader_num);
no_files = 0;
if (deleting)
delete_file(ac, argv[i]);
else
add_file(ac, argv[i]);
}
+ if (sc_mode == 1) {
+ update_card(ac, !deleting, sc_reader_num);
+ ssh_close_authentication_connection(ac);
+ exit(0);
+ }
if (no_files) {
pw = getpwuid(getuid());
if (!pw) {