tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2002/06/23 09:39:55

Browse Source 
[ssh-keygen.c]
     u_int stuff
This commit is contained in:
Ben Lindstrom 2002-06-23 21:28:13 +00:00
parent b1f483f472
commit 58d3b7224f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -14,6 +14,9 @@
[sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c [sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c
sftp.c] sftp.c]
bunch of u_int vs int stuff bunch of u_int vs int stuff
- deraadt@cvs.openbsd.org 2002/06/23 09:39:55
[ssh-keygen.c]
u_int stuff
20020623 20020623
- (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX. - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX.
@ -1058,4 +1061,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2257 2002/06/23 21:27:18 mouring Exp $ $Id: ChangeLog,v 1.2258 2002/06/23 21:28:13 mouring Exp $

11
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.101 2002/06/23 09:39:55 deraadt Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -170,7 +170,7 @@ do_convert_to_ssh2(struct passwd *pw)
} }
fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN);
fprintf(stdout, fprintf(stdout,
"Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n", "Comment: \"%u-bit %s, converted from OpenSSH by %s@%s\"\n",
key_size(k), key_type(k), key_size(k), key_type(k),
pw->pw_name, hostname); pw->pw_name, hostname);
dump_base64(stdout, blob, len); dump_base64(stdout, blob, len);
@ -462,7 +462,7 @@ do_fingerprint(struct passwd *pw)
public = key_load_public(identity_file, &comment); public = key_load_public(identity_file, &comment);
if (public != NULL) { if (public != NULL) {
fp = key_fingerprint(public, fptype, rep); fp = key_fingerprint(public, fptype, rep);
printf("%d %s %s\n", key_size(public), fp, comment); printf("%u %s %s\n", key_size(public), fp, comment);
key_free(public); key_free(public);
xfree(comment); xfree(comment);
xfree(fp); xfree(fp);
@ -496,7 +496,8 @@ do_fingerprint(struct passwd *pw)
if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) { if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) {
int quoted = 0; int quoted = 0;
comment = cp; comment = cp;
for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { for (; *cp && (quoted || (*cp != ' ' &&
*cp != '\t')); cp++) {
if (*cp == '\\' && cp[1] == '"') if (*cp == '\\' && cp[1] == '"')
cp++; /* Skip both */ cp++; /* Skip both */
else if (*cp == '"') else if (*cp == '"')
@ -519,7 +520,7 @@ do_fingerprint(struct passwd *pw)
} }
comment = *cp ? cp : comment; comment = *cp ? cp : comment;
fp = key_fingerprint(public, fptype, rep); fp = key_fingerprint(public, fptype, rep);
printf("%d %s %s\n", key_size(public), fp, printf("%u %s %s\n", key_size(public), fp,
comment ? comment : "no comment"); comment ? comment : "no comment");
xfree(fp); xfree(fp);
key_free(public); key_free(public);