tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ben Lindstrom 2000-12-29 16:50:13 +00:00
parent e76524075e
commit 2941f119e6
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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 20001229
- (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian - (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian

2
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "packet.h" #include "packet.h"

28
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -332,7 +332,6 @@ do_fingerprint(struct passwd *pw)
Key *public; Key *public;
char *comment = NULL, *cp, *ep, line[16*1024]; char *comment = NULL, *cp, *ep, line[16*1024];
int i, skip = 0, num = 1, invalid = 1, success = 0; int i, skip = 0, num = 1, invalid = 1, success = 0;
u_int ignore;
struct stat st; struct stat st;
if (!have_identity) if (!have_identity)
@ -350,7 +349,7 @@ do_fingerprint(struct passwd *pw)
if (try_load_public_key(identity_file, public, &comment)) if (try_load_public_key(identity_file, public, &comment))
success = 1; success = 1;
else else
error("try_load_public_key KEY_UNSPEC failed"); debug("try_load_public_key KEY_UNSPEC failed");
} }
if (success) { if (success) {
printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment); printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment);
@ -359,9 +358,6 @@ do_fingerprint(struct passwd *pw)
exit(0); exit(0);
} }
/* XXX RSA1 only */
public = key_new(KEY_RSA1);
f = fopen(identity_file, "r"); f = fopen(identity_file, "r");
if (f != NULL) { if (f != NULL) {
while (fgets(line, sizeof(line), f)) { while (fgets(line, sizeof(line), f)) {
@ -398,13 +394,21 @@ do_fingerprint(struct passwd *pw)
*cp++ = '\0'; *cp++ = '\0';
} }
ep = cp; ep = cp;
if (auth_rsa_read_key(&cp, &ignore, public->rsa->e, public->rsa->n)) { public = key_new(KEY_RSA1);
invalid = 0; if (key_read(public, &cp) != 1) {
comment = *cp ? cp : comment; cp = ep;
printf("%d %s %s\n", key_size(public), key_free(public);
key_fingerprint(public), public = key_new(KEY_UNSPEC);
comment ? comment : "no comment"); 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); fclose(f);
} }

2
uidswap.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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 "ssh.h"
#include "uidswap.h" #include "uidswap.h"