summaryrefslogtreecommitdiff
path: root/ssh-keygen.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:28:13 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:28:13 +0000
commit58d3b7224fd49bf4d470f9f3ad6bdfc5dbcc1e0a (patch)
treeaa1a9cc27e169850cedc24b20cfca18d3c389899 /ssh-keygen.c
parentb1f483f472da5fd2dbcb009d9988088f43c21579 (diff)
- deraadt@cvs.openbsd.org 2002/06/23 09:39:55
[ssh-keygen.c] u_int stuff
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r--ssh-keygen.c11
1 files changed, 6 insertions, 5 deletions
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"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.100 2002/06/19 00:27:55 deraadt Exp $"); 15RCSID("$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);