summaryrefslogtreecommitdiff
path: root/ssh-add.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-13 04:57:58 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-13 04:57:58 +0000
commitcfccef96a35cb954023a31f9bc10cf3b8f9f8ed3 (patch)
tree4b4137478ea523bc49c8b53aace863e9a80e0031 /ssh-add.c
parent9ae2bb6790ab8d00b5cd29309889b2db50a9bef9 (diff)
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/03/12 22:02:02 [key.c key.h ssh-add.c ssh-keygen.c sshconnect.c sshconnect2.c] remove old key_fingerprint interface, s/_ex//
Diffstat (limited to 'ssh-add.c')
-rw-r--r--ssh-add.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/ssh-add.c b/ssh-add.c
index dc930527..c80b4fb5 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.29 2001/03/02 18:54:31 deraadt Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.30 2001/03/12 22:02:02 markus Exp $");
#include <openssl/evp.h>
@@ -211,10 +211,10 @@ add_file(AuthenticationConnection *ac, const char *filename)
}
void
-list_identities(AuthenticationConnection *ac, int fp)
+list_identities(AuthenticationConnection *ac, int do_fp)
{
Key *key;
- char *comment;
+ char *comment, *fp;
int had_identities = 0;
int version;
@@ -223,10 +223,12 @@ list_identities(AuthenticationConnection *ac, int fp)
key != NULL;
key = ssh_get_next_identity(ac, &comment, version)) {
had_identities = 1;
- if (fp) {
+ if (do_fp) {
+ fp = key_fingerprint(key, SSH_FP_MD5,
+ SSH_FP_HEX);
printf("%d %s %s (%s)\n",
- key_size(key), key_fingerprint(key),
- comment, key_type(key));
+ key_size(key), fp, comment, key_type(key));
+ xfree(fp);
} else {
if (!key_write(key, stdout))
fprintf(stderr, "key_write failed");