===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.63.2.2
retrieving revision 1.64
diff -u -r1.63.2.2 -r1.64
--- src/usr.bin/ssh/ssh-add.c	2003/09/16 21:20:27	1.63.2.2
+++ src/usr.bin/ssh/ssh-add.c	2002/11/21 23:03:51	1.64
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.63.2.2 2003/09/16 21:20:27 brad Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.64 2002/11/21 23:03:51 deraadt Exp $");
 
 #include <openssl/evp.h>
 
@@ -64,9 +64,6 @@
 /* Default lifetime (0 == forever) */
 static int lifetime = 0;
 
-/* User has to confirm key use */
-static int confirm = 0;
-
 /* we keep a cache of one passphrases */
 static char *pass = NULL;
 static void
@@ -158,21 +155,16 @@
 			if (private != NULL)
 				break;
 			clear_pass();
-			snprintf(msg, sizeof msg,
-			    "Bad passphrase, try again for %.200s: ", comment);
+			strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
 		}
 	}
 
- 	if (ssh_add_identity_constrained(ac, private, comment, lifetime,
- 	    confirm)) {
+	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);
- 		if (confirm != 0)
-			fprintf(stderr,
-			    "The user has to confirm each use of the key\n");
 	} else if (ssh_add_identity(ac, private, comment)) {
 		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
 		ret = 0;
@@ -190,23 +182,20 @@
 update_card(AuthenticationConnection *ac, int add, const char *id)
 {
 	char *pin;
-	int ret = -1;
 
 	pin = read_passphrase("Enter passphrase for smartcard: ", RP_ALLOW_STDIN);
 	if (pin == NULL)
 		return -1;
 
-	if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
+	if (ssh_update_card(ac, add, id, pin)) {
 		fprintf(stderr, "Card %s: %s\n",
 		    add ? "added" : "removed", id);
-		ret = 0;
+		return 0;
 	} else {
 		fprintf(stderr, "Could not %s card: %s\n",
 		    add ? "add" : "remove", id);
-		ret = -1;
+		return -1;
 	}
-	xfree(pin);
-	return ret;
 }
 
 static int
@@ -297,7 +286,6 @@
 	fprintf(stderr, "  -x          Lock agent.\n");
 	fprintf(stderr, "  -X          Unlock agent.\n");
 	fprintf(stderr, "  -t life     Set lifetime (in seconds) when adding identities.\n");
-	fprintf(stderr, "  -c          Require confirmation to sign using identities\n");
 #ifdef SMARTCARD
 	fprintf(stderr, "  -s reader   Add key in smartcard reader.\n");
 	fprintf(stderr, "  -e reader   Remove key in smartcard reader.\n");
@@ -321,7 +309,7 @@
 		fprintf(stderr, "Could not open a connection to your authentication agent.\n");
 		exit(2);
 	}
-	while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) {
+	while ((ch = getopt(argc, argv, "lLdDxXe:s:t:")) != -1) {
 		switch (ch) {
 		case 'l':
 		case 'L':
@@ -334,9 +322,6 @@
 			if (lock_agent(ac, ch == 'x' ? 1 : 0) == -1)
 				ret = 1;
 			goto done;
-			break;
-		case 'c':
-			confirm = 1;
 			break;
 		case 'd':
 			deleting = 1;