*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.46 2001/03/09 03:14:39 deraadt Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.50 2001/03/12 22:02:02 markus Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
/* Flag indicating that we just want to see the key fingerprint */
int print_fingerprint = 0;
+int print_bubblebabble = 0;
/* The identity file name, given on the command line or entered by the user. */
char identity_file[1024];
void
do_fingerprint(struct passwd *pw)
{
-
FILE *f;
Key *public;
- char *comment = NULL, *cp, *ep, line[16*1024];
- int i, skip = 0, num = 1, invalid = 1, success = 0;
+ char *comment = NULL, *cp, *ep, line[16*1024], *fp;
+ int i, skip = 0, num = 1, invalid = 1, success = 0, rep, type;
struct stat st;
+ type = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
+ rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
+
if (!have_identity)
ask_filename(pw, "Enter file in which the key is");
if (stat(identity_file, &st) < 0) {
debug("try_load_public_key KEY_UNSPEC failed");
}
if (success) {
- printf("%d %s %s\n", key_size(public), key_fingerprint(public), comment);
+ fp = key_fingerprint(public, type, rep);
+ printf("%d %s %s\n", key_size(public),
+ fp, comment);
key_free(public);
xfree(comment);
+ xfree(fp);
exit(0);
}
}
}
comment = *cp ? cp : comment;
- printf("%d %s %s\n", key_size(public),
- key_fingerprint(public),
+ fp = key_fingerprint(public, type, rep);
+ printf("%d %s %s\n", key_size(public), fp,
comment ? comment : "no comment");
+ xfree(fp);
invalid = 0;
}
fclose(f);
exit(1);
}
- while ((opt = getopt(ac, av, "dqpclRxXyb:f:t:P:N:C:")) != -1) {
+ while ((opt = getopt(ac, av, "dqpclBRxXyb:f:t:P:N:C:")) != -1) {
switch (opt) {
case 'b':
bits = atoi(optarg);
print_fingerprint = 1;
break;
+ case 'B':
+ print_bubblebabble = 1;
+ break;
+
case 'p':
change_passphrase = 1;
break;
printf("Can only have one of -p and -c.\n");
usage();
}
- if (print_fingerprint)
+ if (print_fingerprint || print_bubblebabble)
do_fingerprint(pw);
if (change_passphrase)
do_change_passphrase(pw);
fclose(f);
if (!quiet) {
+ char *fp = key_fingerprint(public, SSH_FP_MD5, SSH_FP_HEX);
printf("Your public key has been saved in %s.\n",
identity_file);
printf("The key fingerprint is:\n");
- printf("%s %s\n", key_fingerprint(public), comment);
+ printf("%s %s\n", fp, comment);
+ xfree(fp);
}
key_free(public);