src/usr.bin/ssh/ssh-keygen.c - diff

Return to ssh-keygen.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/ssh-keygen.c between version 1.40 and 1.51

version 1.40, 2001/01/19 15:55:11

version 1.51, 2001/03/21 14:20:45

Line 16

#include <openssl/evp.h>

#include <openssl/pem.h>

#include <openssl/rsa.h>

#include <openssl/dsa.h>

#include "ssh.h"

#include "xmalloc.h"

#include "key.h"

#include "rsa.h"

#include "authfile.h"

#include "uuencode.h"

#include "buffer.h"

#include "bufaux.h"

#include "pathnames.h"

#include "log.h"

#include "readpass.h"

/* Number of bits in the RSA/DSA key. This value can be changed on the command line. */

int bits = 1024;

Line 49

Line 46

/* 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];

Line 127

Line 125

#define SSH_COM_PUBLIC_BEGIN "---- BEGIN SSH2 PUBLIC KEY ----"

#define SSH_COM_PUBLIC_END "---- END SSH2 PUBLIC KEY ----"

#define SSH_COM_PRIVATE_BEGIN "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----"

#define SSH_COM_PRIVATE_KEY_MAGIC 0x3f6ff9eb

void

do_convert_to_ssh2(struct passwd *pw)

Line 324

Line 322

void

do_fingerprint(struct passwd *pw)

{

FILE *f;

Key *public;

char *comment = NULL, *cp, *ep, line[16*1024];

char *comment = NULL, *cp, *ep, line[16*1024], *fp;

int i, skip = 0, num = 1, invalid = 1, success = 0;

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) {

Line 349

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);

}

Line 402

Line 405

}

comment = *cp ? cp : comment;

printf("%d %s %s\n", key_size(public),

fp = key_fingerprint(public, type, rep);

key_fingerprint(public),

printf("%d %s %s\n", key_size(public), fp,

comment ? comment : "no comment");

xfree(fp);

invalid = 0;

}

fclose(f);

Line 511

Line 515

void

do_change_comment(struct passwd *pw)

{

char new_comment[1024], *comment;

char new_comment[1024], *comment, *passphrase;

Key *private;

Key *private, *public;

Key *public;

char *passphrase;

struct stat st;

FILE *f;

int fd;

if (!have_identity)

ask_filename(pw, "Enter file in which the key is");

Line 531

Line 534

public = key_new(KEY_RSA1);

if (!load_public_key(identity_file, public, NULL)) {

printf("%s is not a valid key file.\n", identity_file);

printf("Comments are only supported in RSA1 keys\n");

exit(1);

}

Line 583

Line 587

key_free(private);

strlcat(identity_file, ".pub", sizeof(identity_file));

f = fopen(identity_file, "w");

fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);

if (!f) {

if (fd == -1) {

printf("Could not save your public key in %s\n", identity_file);

exit(1);

}

f = fdopen(fd, "w");

if (f == NULL) {

printf("fdopen %s failed", identity_file);

exit(1);

}

if (!key_write(public, f))

fprintf(stderr, "write key failed");

key_free(public);

Line 603

Line 612

void

usage(void)

{

printf("Usage: %s [-lpqxXyc] [-t type] [-b bits] [-f file] [-C comment] [-N new-pass] [-P pass]\n", __progname);

printf("Usage: %s [-lBpqxXyc] [-t type] [-b bits] [-f file] [-C comment] "

"[-N new-pass] [-P pass]\n", __progname);

exit(1);

}

Line 614

Line 624

main(int ac, char **av)

{

char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2;

Key *private, *public;

struct passwd *pw;

int opt, type;

int opt, type, fd;

struct stat st;

FILE *f;

Key *private;

Key *public;

extern int optind;

extern char *optarg;

Line 637

Line 646

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);

Line 651

Line 660

print_fingerprint = 1;

break;

case 'B':

print_bubblebabble = 1;

break;

case 'p':

change_passphrase = 1;

break;

Line 718

Line 731

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);

Line 821

Line 834

printf("Your identification has been saved in %s.\n", identity_file);

strlcat(identity_file, ".pub", sizeof(identity_file));

f = fopen(identity_file, "w");

fd = open(identity_file, O_WRONLY | O_CREAT | O_TRUNC, 0644);

if (!f) {

if (fd == -1) {

printf("Could not save your public key in %s\n", identity_file);

exit(1);

}

f = fdopen(fd, "w");

if (f == NULL) {

printf("fdopen %s failed", identity_file);

exit(1);

}

if (!key_write(public, f))

fprintf(stderr, "write key failed");

fprintf(f, " %s\n", comment);

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);