More logging
Log some of the secrets at trace level.
This commit is contained in:
parent
b96762ed55
commit
9f97a89f73
2 changed files with 29 additions and 1 deletions
|
@ -52,6 +52,11 @@ static void create_chain_key(
|
||||||
) {
|
) {
|
||||||
olm::SharedKey secret;
|
olm::SharedKey secret;
|
||||||
_olm_crypto_curve25519_shared_secret(&our_key, &their_key, secret);
|
_olm_crypto_curve25519_shared_secret(&our_key, &their_key, secret);
|
||||||
|
olm_logf(
|
||||||
|
OLM_LOG_TRACE, LOG_CATEGORY, "Shared secret for new chain: %s",
|
||||||
|
olm::bytes_to_string(secret, olm::OLM_SHARED_KEY_LENGTH).c_str()
|
||||||
|
);
|
||||||
|
|
||||||
std::uint8_t derived_secrets[2 * olm::OLM_SHARED_KEY_LENGTH];
|
std::uint8_t derived_secrets[2 * olm::OLM_SHARED_KEY_LENGTH];
|
||||||
_olm_crypto_hkdf_sha256(
|
_olm_crypto_hkdf_sha256(
|
||||||
secret, sizeof(secret),
|
secret, sizeof(secret),
|
||||||
|
@ -97,6 +102,9 @@ static void create_message_keys(
|
||||||
message_key.index = chain_key.index;
|
message_key.index = chain_key.index;
|
||||||
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Created message key with chain key C(%i,%i)",
|
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Created message key with chain key C(%i,%i)",
|
||||||
chain_index, message_key.index);
|
chain_index, message_key.index);
|
||||||
|
olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, "Message key for C(%i,%i) is %s",
|
||||||
|
chain_index, message_key.index,
|
||||||
|
olm::bytes_to_string(message_key.key, olm::OLM_SHARED_KEY_LENGTH).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -221,6 +229,11 @@ void olm::Ratchet::initialise_as_bob(
|
||||||
chain_index = 0;
|
chain_index = 0;
|
||||||
olm::unset(derived_secrets);
|
olm::unset(derived_secrets);
|
||||||
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised receiver chain R(0)");
|
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised receiver chain R(0)");
|
||||||
|
olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, "Root key R(0) is %s",
|
||||||
|
olm::bytes_to_string(root_key, olm::OLM_SHARED_KEY_LENGTH).c_str());
|
||||||
|
olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, "Chain key C(0,0) is %s",
|
||||||
|
olm::bytes_to_string(receiver_chains[0].chain_key.key,
|
||||||
|
olm::OLM_SHARED_KEY_LENGTH).c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -474,6 +487,15 @@ std::size_t olm::Ratchet::encrypt(
|
||||||
);
|
);
|
||||||
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised new sender chain R(%i)",
|
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised new sender chain R(%i)",
|
||||||
chain_index + 1);
|
chain_index + 1);
|
||||||
|
olm_logf(
|
||||||
|
OLM_LOG_TRACE, LOG_CATEGORY, "Root key R(%i): %s", chain_index + 1,
|
||||||
|
olm::bytes_to_string(root_key, OLM_SHARED_KEY_LENGTH).c_str()
|
||||||
|
);
|
||||||
|
olm_logf(
|
||||||
|
OLM_LOG_TRACE, LOG_CATEGORY, "Chain key C(%i, 0): %s", chain_index + 1,
|
||||||
|
olm::bytes_to_string(sender_chain[0].chain_key.key, OLM_SHARED_KEY_LENGTH).c_str()
|
||||||
|
);
|
||||||
|
|
||||||
chain_index++;
|
chain_index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -119,6 +119,9 @@ std::size_t olm::Session::new_outbound_session(
|
||||||
pos += CURVE25519_SHARED_SECRET_LENGTH;
|
pos += CURVE25519_SHARED_SECRET_LENGTH;
|
||||||
_olm_crypto_curve25519_shared_secret(&base_key, &one_time_key, pos);
|
_olm_crypto_curve25519_shared_secret(&base_key, &one_time_key, pos);
|
||||||
|
|
||||||
|
olm_logf(OLM_LOG_TRACE, LOG_CATEGORY,
|
||||||
|
"Initial shared secret %s", bytes_to_string(secret, pos).c_str());
|
||||||
|
|
||||||
ratchet.initialise_as_alice(secret, sizeof(secret), ratchet_key);
|
ratchet.initialise_as_alice(secret, sizeof(secret), ratchet_key);
|
||||||
|
|
||||||
olm::unset(base_key);
|
olm::unset(base_key);
|
||||||
|
@ -236,6 +239,9 @@ std::size_t olm::Session::new_inbound_session(
|
||||||
pos += CURVE25519_SHARED_SECRET_LENGTH;
|
pos += CURVE25519_SHARED_SECRET_LENGTH;
|
||||||
_olm_crypto_curve25519_shared_secret(&bob_one_time_key, &alice_base_key, pos);
|
_olm_crypto_curve25519_shared_secret(&bob_one_time_key, &alice_base_key, pos);
|
||||||
|
|
||||||
|
olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY,
|
||||||
|
"Initial shared secret %s", bytes_to_string(secret, pos).c_str());
|
||||||
|
|
||||||
ratchet.initialise_as_bob(secret, sizeof(secret), ratchet_key);
|
ratchet.initialise_as_bob(secret, sizeof(secret), ratchet_key);
|
||||||
|
|
||||||
olm::unset(secret);
|
olm::unset(secret);
|
||||||
|
|
Loading…
Reference in a new issue