summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-06 21:53:11 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-06 21:53:11 +0000
commit163f3b8f6be475e4fc28358846d0bed7bf0587e4 (patch)
treefc94448e4b46b7a6f51cfab374fc472111985346
parent2f71704b42891fbb486b1925e522ea95739fa8ca (diff)
- markus@cvs.openbsd.org 2002/06/05 20:56:39
[ssh-add.c] add -x/-X to usage
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2abea0972..d1505951f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -114,6 +114,9 @@
114 [authfd.c authfd.h ssh-add.1 ssh-add.c ssh-agent.c] 114 [authfd.c authfd.h ssh-add.1 ssh-add.c ssh-agent.c]
115 ssh-add -x for lock and -X for unlocking the agent. 115 ssh-add -x for lock and -X for unlocking the agent.
116 todo: encrypt private keys with locked... 116 todo: encrypt private keys with locked...
117 - markus@cvs.openbsd.org 2002/06/05 20:56:39
118 [ssh-add.c]
119 add -x/-X to usage
117 120
11820020604 12120020604
119 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed 122 - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -798,4 +801,4 @@
798 - (stevesk) entropy.c: typo in debug message 801 - (stevesk) entropy.c: typo in debug message
799 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 802 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
800 803
801$Id: ChangeLog,v 1.2174 2002/06/06 21:52:03 mouring Exp $ 804$Id: ChangeLog,v 1.2175 2002/06/06 21:53:11 mouring Exp $
diff --git a/ssh-add.c b/ssh-add.c
index ecf4666de..315d94018 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.54 2002/06/05 19:57:12 markus Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.55 2002/06/05 20:56:39 markus Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -278,6 +278,8 @@ usage(void)
278 fprintf(stderr, " -L List public key parameters of all identities.\n"); 278 fprintf(stderr, " -L List public key parameters of all identities.\n");
279 fprintf(stderr, " -d Delete identity.\n"); 279 fprintf(stderr, " -d Delete identity.\n");
280 fprintf(stderr, " -D Delete all identities.\n"); 280 fprintf(stderr, " -D Delete all identities.\n");
281 fprintf(stderr, " -x Lock agent.\n");
282 fprintf(stderr, " -x Unlock agent.\n");
281#ifdef SMARTCARD 283#ifdef SMARTCARD
282 fprintf(stderr, " -s reader Add key in smartcard reader.\n"); 284 fprintf(stderr, " -s reader Add key in smartcard reader.\n");
283 fprintf(stderr, " -e reader Remove key in smartcard reader.\n"); 285 fprintf(stderr, " -e reader Remove key in smartcard reader.\n");