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

Return to ssh-keygen.c CVS log

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

version 1.289, 2016/05/02 08:49:03

version 1.290, 2016/05/02 09:36:42

Line 1584

ca = load_identity(tmp);

free(tmp);

if (key_type_name != NULL &&

sshkey_type_from_name(key_type_name) != ca->type) {

fatal("CA key type %s doesn't match specified %s",

sshkey_ssh_name(ca), key_type_name);

}

for (i = 0; i < argc; i++) {

/* Split list of principals */

n = 0;

Line 1625

Line 1631

&public->cert->signature_key)) != 0)

fatal("key_from_private (ca key): %s", ssh_err(r));

if (sshkey_certify(public, ca) != 0)

if ((r = sshkey_certify(public, ca, key_type_name)) != 0)

fatal("Couldn't not certify key %s", tmp);

fatal("Couldn't certify key %s: %s", tmp, ssh_err(r));

if ((cp = strrchr(tmp, '.')) != NULL && strcmp(cp, ".pub") == 0)

*cp = '\0';