summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 93aaeb033..01de90fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
17 make sure the signature has at least the expected length (don't 17 make sure the signature has at least the expected length (don't
18 insist on len == hlen + oidlen, since this breaks some smartcards) 18 insist on len == hlen + oidlen, since this breaks some smartcards)
19 bugzilla #592; ok djm@ 19 bugzilla #592; ok djm@
20 - markus@cvs.openbsd.org 2003/06/16 10:22:45
21 [ssh-add.c]
22 print out key comment on each prompt; make ssh-askpass more useable; ok djm@
20 23
2120030614 2420030614
22 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@ 25 - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@@ -532,4 +535,4 @@
532 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 535 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
533 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 536 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
534 537
535$Id: ChangeLog,v 1.2806 2003/06/18 10:29:01 djm Exp $ 538$Id: ChangeLog,v 1.2807 2003/06/18 10:29:18 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 9d14a3649..5b0fbbce6 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: ssh-add.c,v 1.67 2003/06/11 11:18:38 djm Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -164,7 +164,8 @@ add_file(AuthenticationConnection *ac, const char *filename)
164 if (private != NULL) 164 if (private != NULL)
165 break; 165 break;
166 clear_pass(); 166 clear_pass();
167 strlcpy(msg, "Bad passphrase, try again: ", sizeof msg); 167 snprintf(msg, sizeof msg,
168 "Bad passphrase, try again for %.200s: ", comment);
168 } 169 }
169 } 170 }
170 171