1 files changed, 8 insertions, 76 deletions

diff --git a/crypto/openssh/ssh-add.c b/crypto/openssh/ssh-add.c
index 53a4a30..526a187 100644
--- a/crypto/openssh/ssh-add.c
+++ b/crypto/openssh/ssh-add.c
@@ -35,7 +35,8 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.61 2002/06/19 00:27:55 deraadt Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.50 2002/01/29 14:27:57 markus Exp $");
+RCSID("$FreeBSD$");
 
 #include <openssl/evp.h>
 
@@ -48,7 +49,6 @@ RCSID("$OpenBSD: ssh-add.c,v 1.61 2002/06/19 00:27:55 deraadt Exp $");
 #include "authfile.h"
 #include "pathnames.h"
 #include "readpass.h"
-#include "misc.h"
 
 /* argv0 */
 extern char *__progname;
@@ -57,12 +57,10 @@ extern char *__progname;
 static char *default_files[] = {
 	_PATH_SSH_CLIENT_ID_RSA,
 	_PATH_SSH_CLIENT_ID_DSA,
-	_PATH_SSH_CLIENT_IDENTITY,
+	_PATH_SSH_CLIENT_IDENTITY, 
 	NULL
 };
 
-/* Default lifetime (0 == forever) */
-static int lifetime = 0;
 
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
@@ -158,19 +156,11 @@ add_file(AuthenticationConnection *ac, const char *filename)
 			strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
 		}
 	}
-
-	if (ssh_add_identity_constrained(ac, private, comment, lifetime)) {
-		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
-		ret = 0;
-		if (lifetime != 0)
-                        fprintf(stderr,
-			    "Lifetime set to %d seconds\n", lifetime);
-	} else if (ssh_add_identity(ac, private, comment)) {
+	if (ssh_add_identity(ac, private, comment)) {
 		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
 		ret = 0;
-	} else {
+	} else
 		fprintf(stderr, "Could not add identity: %s\n", filename);
-	}
 
 	xfree(comment);
 	key_free(private);
@@ -181,13 +171,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
 static int
 update_card(AuthenticationConnection *ac, int add, const char *id)
 {
-	char *pin;
-
-	pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
-	if (pin == NULL)
-		return -1;
-
-	if (ssh_update_card(ac, add, id, pin)) {
+	if (ssh_update_card(ac, add, id)) {
 		fprintf(stderr, "Card %s: %s\n",
 		    add ? "added" : "removed", id);
 		return 0;
@@ -234,34 +218,6 @@ list_identities(AuthenticationConnection *ac, int do_fp)
 }
 
 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)
 {
 	if (deleting) {
@@ -283,9 +239,6 @@ usage(void)
 	fprintf(stderr, "  -L          List public key parameters of all 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");
 #ifdef SMARTCARD
 	fprintf(stderr, "  -s reader   Add key in smartcard reader.\n");
 	fprintf(stderr, "  -e reader   Remove key in smartcard reader.\n");
@@ -309,7 +262,7 @@ main(int argc, char **argv)
 		fprintf(stderr, "Could not open a connection to your authentication agent.\n");
 		exit(2);
 	}
-	while ((ch = getopt(argc, argv, "lLdDxXe:s:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "lLdDe:s:")) != -1) {
 		switch (ch) {
 		case 'l':
 		case 'L':
@@ -317,12 +270,6 @@ main(int argc, char **argv)
 				ret = 1;
 			goto done;
 			break;
-		case 'x':
-		case 'X':
-			if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
-				ret = 1;
-			goto done;
-			break;
 		case 'd':
 			deleting = 1;
 			break;
@@ -338,13 +285,6 @@ main(int argc, char **argv)
 			deleting = 1;
 			sc_reader_id = optarg;
 			break;
-		case 't':
-			if ((lifetime = convtime(optarg)) == -1) {
-				fprintf(stderr, "Invalid lifetime\n");
-				ret = 1;
-				goto done;
-			}
-			break;
 		default:
 			usage();
 			ret = 1;
@@ -361,8 +301,6 @@ main(int argc, char **argv)
 	if (argc == 0) {
 		char buf[MAXPATHLEN];
 		struct passwd *pw;
-		struct stat st;
-		int count = 0;
 
 		if ((pw = getpwuid(getuid())) == NULL) {
 			fprintf(stderr, "No user found with uid %u\n",
@@ -372,17 +310,11 @@ main(int argc, char **argv)
 		}
 
 		for(i = 0; default_files[i]; i++) {
-			snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir,
+			snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, 
 			    default_files[i]);
-			if (stat(buf, &st) < 0)
-				continue;
 			if (do_file(ac, deleting, buf) == -1)
 				ret = 1;
-			else
-				count++;
 		}
-		if (count == 0)
-			ret = 1;
 	} else {
 		for(i = 0; i < argc; i++) {
 			if (do_file(ac, deleting, argv[i]) == -1)