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.312 and 1.313

version 1.312, 2018/02/10 05:48:46

version 1.313, 2018/02/23 15:58:38

Line 267

case KEY_ED25519_CERT:

name = _PATH_SSH_CLIENT_ID_ED25519;

break;

case KEY_XMSS:

case KEY_XMSS_CERT:

name = _PATH_SSH_CLIENT_ID_XMSS;

break;

default:

fatal("bad key type");

}

Line 953

Line 957

{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE },

#endif /* WITH_OPENSSL */

{ "ed25519", "ED25519",_PATH_HOST_ED25519_KEY_FILE },

#ifdef WITH_XMSS

{ "xmss", "XMSS",_PATH_HOST_XMSS_KEY_FILE },

#endif /* WITH_XMSS */

{ NULL, NULL, NULL }

};

Line 1439

Line 1446

}

if (private->type != KEY_ED25519 && !use_new_format) {

if (private->type != KEY_ED25519 && private->type != KEY_XMSS &&

!use_new_format) {

error("Comments are only supported for keys stored in "

"the new format (-o).");

explicit_bzero(passphrase, strlen(passphrase));

Line 1689

Line 1697

fatal("%s: unable to open \"%s\": %s",

__func__, tmp, ssh_err(r));

if (public->type != KEY_RSA && public->type != KEY_DSA &&

public->type != KEY_ECDSA && public->type != KEY_ED25519)

public->type != KEY_ECDSA && public->type != KEY_ED25519 &&

public->type != KEY_XMSS)

fatal("%s: key \"%s\" type %s cannot be certified",

__func__, tmp, sshkey_type(public));

Line 2385

Line 2394

gen_all_hostkeys = 1;

break;

case 'b':

bits = (u_int32_t)strtonum(optarg, 256, 32768, &errstr);

bits = (u_int32_t)strtonum(optarg, 10, 32768, &errstr);

if (errstr)

fatal("Bits has bad value %s (%s)",

optarg, errstr);

Line 2665

Line 2674

_PATH_HOST_ECDSA_KEY_FILE, rr_hostname);

n += do_print_resource_record(pw,

_PATH_HOST_ED25519_KEY_FILE, rr_hostname);

n += do_print_resource_record(pw,

_PATH_HOST_XMSS_KEY_FILE, rr_hostname);

if (n == 0)

fatal("no keys found.");

exit(0);