return (0);
mgf = GC_INIT(algs.mgf, k, ksz);
IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
- trace(T_CRYPTO, "masking index = %s", mpstr(x));
- trace_block(T_CRYPTO, "masking key", k, ksz);
+ trace(T_CRYPTO, "crypto: masking index = %s", mpstr(x));
+ trace_block(T_CRYPTO, "crypto: masking key", k, ksz);
}))
mp_storeb(x, buf_t, n);
GC_ENCRYPT(mgf, buf_t, p, n);
IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
- trace_block(T_CRYPTO, "index plaintext", buf_t, n);
- trace_block(T_CRYPTO, "masked ciphertext", p, n);
+ trace_block(T_CRYPTO, "crypto: index plaintext", buf_t, n);
+ trace_block(T_CRYPTO, "crypto: masked ciphertext", p, n);
}))
GC_DESTROY(mgf);
return (p);
mgf = GC_INIT(algs.mgf, k, ksz);
IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
- trace_block(T_CRYPTO, "unmasking key", k, ksz);
- trace_block(T_CRYPTO, "masked ciphertext", p, n);
+ trace_block(T_CRYPTO, "crypto: unmasking key", k, ksz);
+ trace_block(T_CRYPTO, "crypto: masked ciphertext", p, n);
}))
GC_DECRYPT(mgf, p, buf_t, n);
d = mp_loadb(d, buf_t, n);
IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
- trace_block(T_CRYPTO, "index plaintext", buf_t, n);
- trace(T_CRYPTO, "unmasked index = %s", mpstr(d));
+ trace_block(T_CRYPTO, "crypto: index plaintext", buf_t, n);
+ trace(T_CRYPTO, "crypto: unmasked index = %s", mpstr(d));
}))
GC_DESTROY(mgf);
return (d);
hashge(h, y);
GH_DONE(h, buf_t);
IF_TRACING(T_KEYEXCH, IF_TRACING(T_CRYPTO, {
- trace(T_CRYPTO, "computing challenge check hash");
- trace(T_CRYPTO, "public key = %s", gestr(gg, kpub));
- trace(T_CRYPTO, "receiver challenge = %s", gestr(gg, cc));
- trace(T_CRYPTO, "sender challenge = %s", gestr(gg, c));
- trace(T_CRYPTO, "sender reply = %s", gestr(gg, y));
- trace_block(T_CRYPTO, "hash output", buf_t, algs.hashsz);
+ trace(T_CRYPTO, "crypto: computing challenge check hash");
+ trace(T_CRYPTO, "crypto: public key = %s", gestr(gg, kpub));
+ trace(T_CRYPTO, "crypto: receiver challenge = %s", gestr(gg, cc));
+ trace(T_CRYPTO, "crypto: sender challenge = %s", gestr(gg, c));
+ trace(T_CRYPTO, "crypto: sender reply = %s", gestr(gg, y));
+ trace_block(T_CRYPTO, "crypto: hash output", buf_t, algs.hashsz);
}))
GH_DESTROY(h);
return (buf_t);
a_warn("KX", "?PEER", kx->p, "decrypt-failed", "%s", pkname[msg], A_END);
return (-1);
}
+ if (!BOK(&bb)) return (-1);
buf_init(b, BBASE(&bb), BLEN(&bb));
return (0);
}
void kx_newkeys(keyexch *kx)
{
- if (km_getpubkey(p_name(kx->p), kx->kpub, &kx->texp_kpub))
+ if (km_getpubkey(p_tag(kx->p), kx->kpub, &kx->texp_kpub))
return;
kx->f |= KXF_PUBKEY;
if ((kx->f & KXF_DEAD) || kx->s != KXS_SWITCH) {
kx->ks = ks;
kx->p = p;
kx->kpub = G_CREATE(gg);
- if (km_getpubkey(p_name(p), kx->kpub, &kx->texp_kpub)) {
+ if (km_getpubkey(p_tag(p), kx->kpub, &kx->texp_kpub)) {
G_DESTROY(gg, kx->kpub);
return (-1);
}