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.292 and 1.294

version 1.292, 2016/09/12 03:29:16

version 1.294, 2017/02/10 03:36:40

Line 28

#include <string.h>

#include <unistd.h>

#include <limits.h>

#include <locale.h>

#include "xmalloc.h"

#include "sshkey.h"

Line 47

Line 48

#include "atomicio.h"

#include "krl.h"

#include "digest.h"

#include "utf8.h"

#ifdef ENABLE_PKCS11

#include "ssh-pkcs11.h"

Line 829

Line 831

ra = sshkey_fingerprint(public, fingerprint_hash, SSH_FP_RANDOMART);

if (fp == NULL || ra == NULL)

fatal("%s: sshkey_fingerprint failed", __func__);

printf("%u %s %s (%s)\n", sshkey_size(public), fp,

mprintf("%u %s %s (%s)\n", sshkey_size(public), fp,

comment ? comment : "no comment", sshkey_type(public));

if (log_level >= SYSLOG_LEVEL_VERBOSE)

printf("%s\n", ra);

Line 1150

Line 1152

known_hosts_hash(l, ctx);

else if (print_fingerprint) {

fp = sshkey_fingerprint(l->key, fptype, rep);

printf("%s %s %s %s\n", ctx->host,

mprintf("%s %s %s %s\n", ctx->host,

sshkey_type(l->key), fp, l->comment);

free(fp);

} else

Line 1301

Line 1303

fatal("Failed to load key %s: %s", identity_file, ssh_err(r));

}

if (comment)

printf("Key has comment '%s'\n", comment);

mprintf("Key has comment '%s'\n", comment);

/* Ask the new passphrase (twice). */

if (identity_new_passphrase) {

Line 1425

Line 1427

sshkey_free(private);

exit(1);

}

printf("Key now has comment '%s'\n", comment);

if (comment)

printf("Key now has comment '%s'\n", comment);

else

printf("Key now has no comment\n");

if (identity_comment) {

strlcpy(new_comment, identity_comment, sizeof(new_comment));

Line 2259

Line 2264

OpenSSL_add_all_algorithms();

log_init(argv[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);

setlocale(LC_CTYPE, "");

/* we need this for the home * directory. */

pw = getpwuid(getuid());