diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | channels.c | 2 | ||||
| -rw-r--r-- | ssh-keygen.c | 28 | ||||
| -rw-r--r-- | uidswap.c | 2 |
4 files changed, 24 insertions, 14 deletions
@@ -1,3 +1,9 @@ +20001230 + - (bal) OpenBSD CVS Update + - markus@cvs.openbsd.org 2000/12/28 18:58:30 + [ssh-keygen.c] + enable 'ssh-keygen -l -f ~/.ssh/{authorized_keys,known_hosts}{,2} + - (bal) Resynced CVS ID with OpenBSD for channel.c and uidswap.c 20001229 - (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian diff --git a/channels.c b/channels.c index 3c2f15f2a..6879d167d 100644 --- a/channels.c +++ b/channels.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.77 2000/12/19 23:17:56 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.78 2000/12/29 11:05:55 markus Exp $"); #include "ssh.h" #include "packet.h" diff --git a/ssh-keygen.c b/ssh-keygen.c index 057803351..87be6a5f8 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.37 2000/12/22 16:49:40 markus Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.38 2000/12/28 18:58:39 markus Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -332,7 +332,6 @@ do_fingerprint(struct passwd *pw) Key *public; char *comment = NULL, *cp, *ep, line[16*1024]; int i, skip = 0, num = 1, invalid = 1, success = 0; - u_int ignore; struct stat st; if (!have_identity) @@ -350,7 +349,7 @@ do_fingerprint(struct passwd *pw) if (try_load_public_key(identity_file, public, &comment)) success = 1; else - error("try_load_public_key KEY_UNSPEC failed"); + debug("try_load_public_key KEY_UNSPEC failed"); } if (success) { printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment); @@ -359,9 +358,6 @@ do_fingerprint(struct passwd *pw) exit(0); } - /* XXX RSA1 only */ - - public = key_new(KEY_RSA1); f = fopen(identity_file, "r"); if (f != NULL) { while (fgets(line, sizeof(line), f)) { @@ -398,13 +394,21 @@ do_fingerprint(struct passwd *pw) *cp++ = '\0'; } ep = cp; - if (auth_rsa_read_key(&cp, &ignore, public->rsa->e, public->rsa->n)) { - invalid = 0; - comment = *cp ? cp : comment; - printf("%d %s %s\n", key_size(public), - key_fingerprint(public), - comment ? comment : "no comment"); + public = key_new(KEY_RSA1); + if (key_read(public, &cp) != 1) { + cp = ep; + key_free(public); + public = key_new(KEY_UNSPEC); + if (key_read(public, &cp) != 1) { + key_free(public); + continue; + } } + comment = *cp ? cp : comment; + printf("%d %s %s\n", key_size(public), + key_fingerprint(public), + comment ? comment : "no comment"); + invalid = 0; } fclose(f); } @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: uidswap.c,v 1.11 2000/12/20 19:37:22 markus Exp $"); +RCSID("$OpenBSD: uidswap.c,v 1.12 2000/12/29 10:48:56 markus Exp $"); #include "ssh.h" #include "uidswap.h" |