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.283 and 1.288

version 1.283, 2015/11/20 23:04:01

version 1.288, 2016/02/15 09:47:49

Line 514

sshbuf_free(b);

/* try the key */

if (sshkey_sign(key, &sig, &slen, data, sizeof(data), 0) != 0 ||

if (sshkey_sign(key, &sig, &slen, data, sizeof(data), NULL, 0) != 0 ||

sshkey_verify(key, sig, slen, data, sizeof(data), 0) != 0) {

sshkey_free(key);

free(sig);

Line 867

{

FILE *f;

struct sshkey *public = NULL;

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

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

int i, invalid = 1;

const char *path;

long int lnum = 0;

Line 1216

foreach_options |= print_fingerprint ? HKF_WANT_PARSE_KEY : 0;

if ((r = hostkeys_foreach(identity_file,

hash_hosts ? known_hosts_hash : known_hosts_find_delete, &ctx,

name, NULL, foreach_options)) != 0)

name, NULL, foreach_options)) != 0) {

if (inplace)

unlink(tmp);

fatal("%s: hostkeys_foreach failed: %s", __func__, ssh_err(r));

}

if (inplace)

fclose(ctx.out);

Line 1900

Line 1903

struct stat st;

int r, is_stdin = 0, ok = 0;

FILE *f;

char *cp, line[2048];

char *cp, line[SSH_MAX_PUBKEY_BYTES];

const char *path;

long int lnum = 0;

Line 2149

Line 2152

close(fd);

sshbuf_free(kbuf);

ssh_krl_free(krl);

if (ca != NULL)

sshkey_free(ca);

}

static void

Line 2246

Line 2248

extern int optind;

extern char *optarg;

ssh_malloc_init(); /* must be called before any mallocs */

/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */

sanitise_stdfd();