diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 11 |
2 files changed, 10 insertions, 6 deletions
@@ -14,6 +14,9 @@ | |||
14 | [sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c | 14 | [sftp-client.c sftp-client.h sftp-common.c sftp-int.c sftp-server.c |
15 | sftp.c] | 15 | sftp.c] |
16 | bunch of u_int vs int stuff | 16 | bunch of u_int vs int stuff |
17 | - deraadt@cvs.openbsd.org 2002/06/23 09:39:55 | ||
18 | [ssh-keygen.c] | ||
19 | u_int stuff | ||
17 | 20 | ||
18 | 20020623 | 21 | 20020623 |
19 | - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX. | 22 | - (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX. |
@@ -1058,4 +1061,4 @@ | |||
1058 | - (stevesk) entropy.c: typo in debug message | 1061 | - (stevesk) entropy.c: typo in debug message |
1059 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1062 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1060 | 1063 | ||
1061 | $Id: ChangeLog,v 1.2257 2002/06/23 21:27:18 mouring Exp $ | 1064 | $Id: ChangeLog,v 1.2258 2002/06/23 21:28:13 mouring Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index df8c90afb..4273c1132 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.101 2002/06/23 09:39:55 deraadt Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -170,7 +170,7 @@ do_convert_to_ssh2(struct passwd *pw) | |||
170 | } | 170 | } |
171 | fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); | 171 | fprintf(stdout, "%s\n", SSH_COM_PUBLIC_BEGIN); |
172 | fprintf(stdout, | 172 | fprintf(stdout, |
173 | "Comment: \"%d-bit %s, converted from OpenSSH by %s@%s\"\n", | 173 | "Comment: \"%u-bit %s, converted from OpenSSH by %s@%s\"\n", |
174 | key_size(k), key_type(k), | 174 | key_size(k), key_type(k), |
175 | pw->pw_name, hostname); | 175 | pw->pw_name, hostname); |
176 | dump_base64(stdout, blob, len); | 176 | dump_base64(stdout, blob, len); |
@@ -462,7 +462,7 @@ do_fingerprint(struct passwd *pw) | |||
462 | public = key_load_public(identity_file, &comment); | 462 | public = key_load_public(identity_file, &comment); |
463 | if (public != NULL) { | 463 | if (public != NULL) { |
464 | fp = key_fingerprint(public, fptype, rep); | 464 | fp = key_fingerprint(public, fptype, rep); |
465 | printf("%d %s %s\n", key_size(public), fp, comment); | 465 | printf("%u %s %s\n", key_size(public), fp, comment); |
466 | key_free(public); | 466 | key_free(public); |
467 | xfree(comment); | 467 | xfree(comment); |
468 | xfree(fp); | 468 | xfree(fp); |
@@ -496,7 +496,8 @@ do_fingerprint(struct passwd *pw) | |||
496 | if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) { | 496 | if (i == 0 || ep == NULL || (*ep != ' ' && *ep != '\t')) { |
497 | int quoted = 0; | 497 | int quoted = 0; |
498 | comment = cp; | 498 | comment = cp; |
499 | for (; *cp && (quoted || (*cp != ' ' && *cp != '\t')); cp++) { | 499 | for (; *cp && (quoted || (*cp != ' ' && |
500 | *cp != '\t')); cp++) { | ||
500 | if (*cp == '\\' && cp[1] == '"') | 501 | if (*cp == '\\' && cp[1] == '"') |
501 | cp++; /* Skip both */ | 502 | cp++; /* Skip both */ |
502 | else if (*cp == '"') | 503 | else if (*cp == '"') |
@@ -519,7 +520,7 @@ do_fingerprint(struct passwd *pw) | |||
519 | } | 520 | } |
520 | comment = *cp ? cp : comment; | 521 | comment = *cp ? cp : comment; |
521 | fp = key_fingerprint(public, fptype, rep); | 522 | fp = key_fingerprint(public, fptype, rep); |
522 | printf("%d %s %s\n", key_size(public), fp, | 523 | printf("%u %s %s\n", key_size(public), fp, |
523 | comment ? comment : "no comment"); | 524 | comment ? comment : "no comment"); |
524 | xfree(fp); | 525 | xfree(fp); |
525 | key_free(public); | 526 | key_free(public); |