I'd rather see the cipher and MAC named separately, with a hint that
the two are linked together in some way, than see the cipher called by
a name including the MAC and the MAC init message have an ugly
'<implicit>' in it.
logeventf(ssh, "Initialised %.200s client->server encryption",
ssh->cscipher->text_name);
logeventf(ssh, "Initialised %.200s client->server encryption",
ssh->cscipher->text_name);
- logeventf(ssh, "Initialised %.200s client->server MAC algorithm%s",
+ logeventf(ssh, "Initialised %.200s client->server MAC algorithm%s%s",
- ssh->csmac_etm ? " (in ETM mode)" : "");
+ ssh->csmac_etm ? " (in ETM mode)" : "",
+ ssh->cscipher->required_mac ? " (required by cipher)" : "");
if (ssh->cscomp->text_name)
logeventf(ssh, "Initialised %s compression",
ssh->cscomp->text_name);
if (ssh->cscomp->text_name)
logeventf(ssh, "Initialised %s compression",
ssh->cscomp->text_name);
}
logeventf(ssh, "Initialised %.200s server->client encryption",
ssh->sccipher->text_name);
}
logeventf(ssh, "Initialised %.200s server->client encryption",
ssh->sccipher->text_name);
- logeventf(ssh, "Initialised %.200s server->client MAC algorithm%s",
+ logeventf(ssh, "Initialised %.200s server->client MAC algorithm%s%s",
- ssh->scmac_etm ? " (in ETM mode)" : "");
+ ssh->scmac_etm ? " (in ETM mode)" : "",
+ ssh->sccipher->required_mac ? " (required by cipher)" : "");
if (ssh->sccomp->text_name)
logeventf(ssh, "Initialised %s decompression",
ssh->sccomp->text_name);
if (ssh->sccomp->text_name)
logeventf(ssh, "Initialised %s decompression",
ssh->sccomp->text_name);
poly_start, poly_bytes, poly_genresult, poly_verresult,
"", "", /* Not selectable individually, just part of ChaCha20-Poly1305 */
poly_start, poly_bytes, poly_genresult, poly_verresult,
"", "", /* Not selectable individually, just part of ChaCha20-Poly1305 */
};
static void *ccp_make_context(void)
};
static void *ccp_make_context(void)
ccp_decrypt_length,
"chacha20-poly1305@openssh.com",
ccp_decrypt_length,
"chacha20-poly1305@openssh.com",
- 1, 512, SSH_CIPHER_SEPARATE_LENGTH, "ChaCha20 Poly1305",
+ 1, 512, SSH_CIPHER_SEPARATE_LENGTH, "ChaCha20",