version 1.53, 2002/03/21 22:44:05 |
version 1.53.2.1, 2002/06/26 15:30:39 |
|
|
#include "authfile.h" |
#include "authfile.h" |
#include "pathnames.h" |
#include "pathnames.h" |
#include "readpass.h" |
#include "readpass.h" |
|
#include "misc.h" |
|
|
/* argv0 */ |
/* argv0 */ |
extern char *__progname; |
extern char *__progname; |
|
|
NULL |
NULL |
}; |
}; |
|
|
|
/* Default lifetime (0 == forever) */ |
|
static int lifetime = 0; |
|
|
/* we keep a cache of one passphrases */ |
/* we keep a cache of one passphrases */ |
static char *pass = NULL; |
static char *pass = NULL; |
|
|
strlcpy(msg, "Bad passphrase, try again: ", sizeof msg); |
strlcpy(msg, "Bad passphrase, try again: ", sizeof msg); |
} |
} |
} |
} |
if (ssh_add_identity(ac, private, comment)) { |
|
|
if (ssh_add_identity_constrained(ac, private, comment, lifetime)) { |
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); |
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); |
ret = 0; |
ret = 0; |
} else |
if (lifetime != 0) |
|
fprintf(stderr, |
|
"Lifetime set to %d seconds\n", lifetime); |
|
} else if (ssh_add_identity(ac, private, comment)) { |
|
fprintf(stderr, "Identity added: %s (%s)\n", filename, comment); |
|
ret = 0; |
|
} else { |
fprintf(stderr, "Could not add identity: %s\n", filename); |
fprintf(stderr, "Could not add identity: %s\n", filename); |
|
} |
|
|
xfree(comment); |
xfree(comment); |
key_free(private); |
key_free(private); |
|
|
} |
} |
|
|
static int |
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); |
|
return -1; |
|
} |
|
|
|
static int |
do_file(AuthenticationConnection *ac, int deleting, char *file) |
do_file(AuthenticationConnection *ac, int deleting, char *file) |
{ |
{ |
if (deleting) { |
if (deleting) { |
|
|
fprintf(stderr, " -L List public key parameters of all identities.\n"); |
fprintf(stderr, " -L List public key parameters of all identities.\n"); |
fprintf(stderr, " -d Delete identity.\n"); |
fprintf(stderr, " -d Delete identity.\n"); |
fprintf(stderr, " -D Delete all identities.\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"); |
#ifdef SMARTCARD |
#ifdef SMARTCARD |
fprintf(stderr, " -s reader Add key in smartcard reader.\n"); |
fprintf(stderr, " -s reader Add key in smartcard reader.\n"); |
fprintf(stderr, " -e reader Remove key in smartcard reader.\n"); |
fprintf(stderr, " -e reader Remove key in smartcard reader.\n"); |
|
|
fprintf(stderr, "Could not open a connection to your authentication agent.\n"); |
fprintf(stderr, "Could not open a connection to your authentication agent.\n"); |
exit(2); |
exit(2); |
} |
} |
while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) { |
while ((ch = getopt(argc, argv, "lLdDxXe:s:t:")) != -1) { |
switch (ch) { |
switch (ch) { |
case 'l': |
case 'l': |
case 'L': |
case 'L': |
|
|
ret = 1; |
ret = 1; |
goto done; |
goto done; |
break; |
break; |
|
case 'x': |
|
case 'X': |
|
if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1) |
|
ret = 1; |
|
goto done; |
|
break; |
case 'd': |
case 'd': |
deleting = 1; |
deleting = 1; |
break; |
break; |
|
|
case 'e': |
case 'e': |
deleting = 1; |
deleting = 1; |
sc_reader_id = optarg; |
sc_reader_id = optarg; |
|
break; |
|
case 't': |
|
if ((lifetime = convtime(optarg)) == -1) { |
|
fprintf(stderr, "Invalid lifetime\n"); |
|
ret = 1; |
|
goto done; |
|
} |
break; |
break; |
default: |
default: |
usage(); |
usage(); |