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.357 and 1.358

version 1.357, 2019/10/31 21:17:09

version 1.358, 2019/10/31 21:23:19

Line 562

error("%s: remaining bytes in key blob %d", __func__, rlen);

/* try the key */

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

if (sshkey_sign(key, &sig, &slen, data, sizeof(data),

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

NULL, NULL, 0) != 0 ||

sshkey_verify(key, sig, slen, data, sizeof(data),

NULL, 0) != 0) {

sshkey_free(key);

free(sig);

return NULL;

Line 1688

Line 1690

static int

agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp,

const u_char *data, size_t datalen,

const char *alg, u_int compat, void *ctx)

const char *alg, const char *sk_provider, u_int compat, void *ctx)

{

int *agent_fdp = (int *)ctx;

Line 1800

Line 1802

if (agent_fd != -1 && (ca->flags & SSHKEY_FLAG_EXT) != 0) {

if ((r = sshkey_certify_custom(public, ca,

key_type_name, agent_signer, &agent_fd)) != 0)

key_type_name, sk_provider, agent_signer,

&agent_fd)) != 0)

fatal("Couldn't certify key %s via agent: %s",

tmp, ssh_err(r));

} else {

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

if ((sshkey_certify(public, ca, key_type_name,

sk_provider)) != 0)

fatal("Couldn't certify key %s: %s",

tmp, ssh_err(r));

}

Line 2488

Line 2492

else

fprintf(stderr, "Signing file %s\n", filename);

}

if ((r = sshsig_sign_fd(signkey, NULL, fd, sig_namespace,

if ((r = sshsig_sign_fd(signkey, NULL, sk_provider, fd, sig_namespace,

&sigbuf, signer, signer_ctx)) != 0) {

error("Signing %s failed: %s", filename, ssh_err(r));

goto out;