timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

translate logging.cpp to C

Browse source
This commit is contained in:
Richard van der Hoff 2016-05-13 11:53:33 +01:00
parent 48cb5f925d
commit b3db0e6ee1
8 changed files with 64 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
include/olm/logging.hh → include/olm/logging.h
View file

@ -13,26 +13,32 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef OLM_LOGGING_HH_ #ifndef OLM_LOGGING_H_
#define OLM_LOGGING_HH_ #define OLM_LOGGING_H_
namespace olm { #include "olm/olm.hh"
const unsigned int LOG_FATAL = 1; #ifdef __cplusplus
const unsigned int LOG_ERROR = 2; extern "C" {
const unsigned int LOG_WARNING = 3; #endif
const unsigned int LOG_INFO = 4;
const unsigned int LOG_DEBUG = 5;
const unsigned int LOG_TRACE = 6;
void set_log_level(unsigned int log_level); #define OLM_LOG_FATAL 1
#define OLM_LOG_ERROR 2
#define OLM_LOG_WARNING 3
#define OLM_LOG_INFO 4
#define OLM_LOG_DEBUG 5
#define OLM_LOG_TRACE 6
bool log_enabled_for(unsigned int level, const char *category); /* returns non-zero if logging is enabled for this level */
int olm_log_enabled_for(unsigned int level, const char *category);
__attribute__((__format__ (__printf__, 3, 4))) __attribute__((__format__ (__printf__, 3, 4)))
void logf(unsigned int level, const char *category, void olm_logf(unsigned int level, const char *category,
const char *format, ...); const char *format, ...);
} // namespace olm
#endif /* OLM_LOGGING_HH_ */ #ifdef __cplusplus
} // extern "C"
#endif
#endif /* OLM_LOGGING_H_ */

6
include/olm/olm.hh
View file

@ -25,9 +25,9 @@ extern "C" {
static const size_t OLM_MESSAGE_TYPE_PRE_KEY = 0; static const size_t OLM_MESSAGE_TYPE_PRE_KEY = 0;
static const size_t OLM_MESSAGE_TYPE_MESSAGE = 1; static const size_t OLM_MESSAGE_TYPE_MESSAGE = 1;
struct OlmAccount; typedef struct OlmAccount OlmAccount;
struct OlmSession; typedef struct OlmSession OlmSession;
struct OlmUtility; typedef struct OlmUtility OlmUtility;
/** The size of an account object in bytes */ /** The size of an account object in bytes */
size_t olm_account_size(); size_t olm_account_size();

8
src/account.cpp
View file

@ -14,7 +14,7 @@
*/ */
#include "olm/account.hh" #include "olm/account.hh"
#include "olm/base64.hh" #include "olm/base64.hh"
#include "olm/logging.hh" #include "olm/logging.h"
#include "olm/pickle.hh" #include "olm/pickle.hh"
#include "olm/memory.hh" #include "olm/memory.hh"
@ -45,11 +45,11 @@ std::size_t olm::Account::remove_key(
if (olm::array_equal(i->key.public_key, public_key.public_key)) { if (olm::array_equal(i->key.public_key, public_key.public_key)) {
std::uint32_t id = i->id; std::uint32_t id = i->id;
one_time_keys.erase(i); one_time_keys.erase(i);
olm::logf(olm::LOG_INFO, LOG_CATEGORY, "removed key id %i", id); olm_logf(OLM_LOG_INFO, LOG_CATEGORY, "removed key id %i", id);
return id; return id;
} }
} }
olm::logf(olm::LOG_WARNING, LOG_CATEGORY, "Couldn't find key to remove"); olm_logf(OLM_LOG_WARNING, LOG_CATEGORY, "Couldn't find key to remove");
return std::size_t(-1); return std::size_t(-1);
} }
@ -69,7 +69,7 @@ std::size_t olm::Account::new_account(
random += KEY_LENGTH; random += KEY_LENGTH;
olm::curve25519_generate_key(random, identity_keys.curve25519_key); olm::curve25519_generate_key(random, identity_keys.curve25519_key);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Created new account"); olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Created new account");
return 0; return 0;
} }

16
src/logging.cpp → src/logging.c
View file

@ -13,25 +13,23 @@
* limitations under the License. * limitations under the License.
*/ */
#include "olm/logging.hh" #include "olm/logging.h"
#include <cstdarg> #include <stdarg.h>
#include <cstdio> #include <stdio.h>
namespace olm {
static unsigned int log_level = 1; static unsigned int log_level = 1;
void set_log_level(unsigned int level) { void olm_set_log_level(unsigned int level) {
log_level = level; log_level = level;
} }
bool log_enabled_for(unsigned int level, const char *category) int olm_log_enabled_for(unsigned int level, const char *category)
{ {
return level <= log_level; return level <= log_level;
} }
void logf(unsigned int level, const char *category, void olm_logf(unsigned int level, const char *category,
const char *format, ...) { const char *format, ...) {
if (level > log_level) { if (level > log_level) {
return; return;
@ -47,5 +45,3 @@ void logf(unsigned int level, const char *category,
putchar('\n'); putchar('\n');
} }
} // namespace olm

6
src/message.cpp
View file

@ -14,7 +14,7 @@
*/ */
#include "olm/message.hh" #include "olm/message.hh"
#include "olm/logging.hh" #include "olm/logging.h"
#include "olm/memory.hh" #include "olm/memory.hh"
namespace { namespace {
@ -239,7 +239,7 @@ void olm::decode_message(
} }
unknown = pos; unknown = pos;
} }
olm::logf(olm::LOG_TRACE, LOG_CATEGORY, olm_logf(OLM_LOG_TRACE, LOG_CATEGORY,
"Decoded message ver=%i ratchet_key=%s chain_idx=%i ciphertext=%s", "Decoded message ver=%i ratchet_key=%s chain_idx=%i ciphertext=%s",
reader.version, reader.version,
olm::bytes_to_string(reader.ratchet_key, reader.ratchet_key_length).c_str(), olm::bytes_to_string(reader.ratchet_key, reader.ratchet_key_length).c_str(),
@ -335,7 +335,7 @@ void olm::decode_one_time_key_message(
unknown = pos; unknown = pos;
} }
olm::logf(olm::LOG_TRACE, LOG_CATEGORY, olm_logf(OLM_LOG_TRACE, LOG_CATEGORY,
"Decoded pre-key message ver=%i one_time_key[Eb]=%s " "Decoded pre-key message ver=%i one_time_key[Eb]=%s "
"base_key[Ea]=%s identity_key[Ia]=%s message=%s", "base_key[Ea]=%s identity_key[Ia]=%s message=%s",
reader.version, reader.version,

8
src/olm.cpp
View file

@ -19,7 +19,7 @@
#include "olm/base64.hh" #include "olm/base64.hh"
#include "olm/cipher.hh" #include "olm/cipher.hh"
#include "olm/memory.hh" #include "olm/memory.hh"
#include "olm/logging.hh" #include "olm/logging.h"
#include <new> #include <new>
#include <cstring> #include <cstring>
@ -819,10 +819,4 @@ size_t olm_ed25519_verify(
); );
} }
void olm_set_log_level(
unsigned int level
) {
olm::set_log_level(level);
}
} }

24
src/ratchet.cpp
View file

@ -17,7 +17,7 @@
#include "olm/memory.hh" #include "olm/memory.hh"
#include "olm/cipher.hh" #include "olm/cipher.hh"
#include "olm/pickle.hh" #include "olm/pickle.hh"
#include "olm/logging.hh" #include "olm/logging.h"
#include <cstring> #include <cstring>
@ -79,7 +79,7 @@ static void advance_chain_key(
new_chain_key.key new_chain_key.key
); );
new_chain_key.index = chain_key.index + 1; new_chain_key.index = chain_key.index + 1;
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Derived chain key C(%i,%i)", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Derived chain key C(%i,%i)",
chain_index, new_chain_key.index); chain_index, new_chain_key.index);
} }
@ -95,7 +95,7 @@ static void create_message_keys(
message_key.key message_key.key
); );
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);
} }
@ -176,7 +176,7 @@ static std::size_t verify_mac_and_decrypt_for_new_chain(
new_chain.ratchet_key, session.kdf_info, new_chain.ratchet_key, session.kdf_info,
new_root_key, new_chain.chain_key new_root_key, new_chain.chain_key
); );
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Calculated new receiver chain R(%i)", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Calculated new receiver chain R(%i)",
chain_index); chain_index);
std::size_t result = verify_mac_and_decrypt_for_existing_chain( std::size_t result = verify_mac_and_decrypt_for_existing_chain(
@ -219,7 +219,7 @@ void olm::Ratchet::initialise_as_bob(
receiver_chains[0].ratchet_key = their_ratchet_key; receiver_chains[0].ratchet_key = their_ratchet_key;
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)");
} }
@ -242,7 +242,7 @@ void olm::Ratchet::initialise_as_alice(
sender_chain[0].ratchet_key = our_ratchet_key; sender_chain[0].ratchet_key = our_ratchet_key;
chain_index = 0; chain_index = 0;
olm::unset(derived_secrets); olm::unset(derived_secrets);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Initialised sender chain R(0)"); olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised sender chain R(0)");
} }
namespace olm { namespace olm {
@ -450,7 +450,7 @@ std::size_t olm::Ratchet::encrypt(
if (sender_chain.empty()) { if (sender_chain.empty()) {
sender_chain.insert(); sender_chain.insert();
olm::curve25519_generate_key(random, sender_chain[0].ratchet_key); olm::curve25519_generate_key(random, sender_chain[0].ratchet_key);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Created new ratchet key T(%i) %s", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Created new ratchet key T(%i) %s",
chain_index + 1, chain_index + 1,
sender_chain[0].ratchet_key.to_string().c_str()); sender_chain[0].ratchet_key.to_string().c_str());
create_chain_key( create_chain_key(
@ -460,7 +460,7 @@ std::size_t olm::Ratchet::encrypt(
kdf_info, kdf_info,
root_key, sender_chain[0].chain_key root_key, sender_chain[0].chain_key
); );
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);
chain_index++; chain_index++;
} }
@ -491,7 +491,7 @@ std::size_t olm::Ratchet::encrypt(
output, output_length output, output_length
); );
olm::logf(olm::LOG_TRACE, LOG_CATEGORY, olm_logf(OLM_LOG_TRACE, LOG_CATEGORY,
"Encoded message ver=%i ratchet_key=%s chain_idx=%i ciphertext=%s", "Encoded message ver=%i ratchet_key=%s chain_idx=%i ciphertext=%s",
PROTOCOL_VERSION, PROTOCOL_VERSION,
olm::bytes_to_string(writer.ratchet_key, olm::KEY_LENGTH).c_str(), olm::bytes_to_string(writer.ratchet_key, olm::KEY_LENGTH).c_str(),
@ -525,7 +525,7 @@ std::size_t olm::Ratchet::decrypt(
std::uint8_t const * input, std::size_t input_length, std::uint8_t const * input, std::size_t input_length,
std::uint8_t * plaintext, std::size_t max_plaintext_length std::uint8_t * plaintext, std::size_t max_plaintext_length
) { ) {
olm::logf(olm::LOG_TRACE, LOG_CATEGORY, olm_logf(OLM_LOG_TRACE, LOG_CATEGORY,
"Decrypting message %s", "Decrypting message %s",
olm::bytes_to_string(input, input_length).c_str()); olm::bytes_to_string(input, input_length).c_str());
@ -580,7 +580,7 @@ std::size_t olm::Ratchet::decrypt(
std::size_t result = std::size_t(-1); std::size_t result = std::size_t(-1);
if (!chain) { if (!chain) {
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY,
"Sender ratchet key does not match known chain; starting new one"); "Sender ratchet key does not match known chain; starting new one");
result = verify_mac_and_decrypt_for_new_chain( result = verify_mac_and_decrypt_for_new_chain(
*this, reader, plaintext, max_plaintext_length *this, reader, plaintext, max_plaintext_length
@ -642,7 +642,7 @@ std::size_t olm::Ratchet::decrypt(
olm::unset(sender_chain[0]); olm::unset(sender_chain[0]);
sender_chain.erase(sender_chain.begin()); sender_chain.erase(sender_chain.begin());
receiver_chain_index = ++chain_index; receiver_chain_index = ++chain_index;
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Initialised new receiver chain R(%i)", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised new receiver chain R(%i)",
chain_index); chain_index);
} }

30
src/session.cpp
View file

@ -16,7 +16,7 @@
#include "olm/cipher.hh" #include "olm/cipher.hh"
#include "olm/crypto.hh" #include "olm/crypto.hh"
#include "olm/account.hh" #include "olm/account.hh"
#include "olm/logging.hh" #include "olm/logging.h"
#include "olm/memory.hh" #include "olm/memory.hh"
#include "olm/message.hh" #include "olm/message.hh"
#include "olm/pickle.hh" #include "olm/pickle.hh"
@ -68,7 +68,7 @@ std::size_t olm::Session::new_outbound_session(
return std::size_t(-1); return std::size_t(-1);
} }
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY,
"Creating new outbound session to receiver identity IB %s, " "Creating new outbound session to receiver identity IB %s, "
"receiver ephemeral EB %s", identity_key.to_string().c_str(), "receiver ephemeral EB %s", identity_key.to_string().c_str(),
one_time_key.to_string().c_str() one_time_key.to_string().c_str()
@ -76,12 +76,12 @@ std::size_t olm::Session::new_outbound_session(
olm::Curve25519KeyPair base_key; olm::Curve25519KeyPair base_key;
olm::curve25519_generate_key(random, base_key); olm::curve25519_generate_key(random, base_key);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Created new ephemeral key EA %s", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Created new ephemeral key EA %s",
base_key.to_string().c_str()); base_key.to_string().c_str());
olm::Curve25519KeyPair ratchet_key; olm::Curve25519KeyPair ratchet_key;
olm::curve25519_generate_key(random + olm::KEY_LENGTH, ratchet_key); olm::curve25519_generate_key(random + olm::KEY_LENGTH, ratchet_key);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Created new ratchet key T(0) %s", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Created new ratchet key T(0) %s",
ratchet_key.to_string().c_str()); ratchet_key.to_string().c_str());
olm::Curve25519KeyPair const & alice_identity_key_pair = ( olm::Curve25519KeyPair const & alice_identity_key_pair = (
@ -108,7 +108,7 @@ std::size_t olm::Session::new_outbound_session(
olm::unset(ratchet_key); olm::unset(ratchet_key);
olm::unset(secret); olm::unset(secret);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Initialised outbound session"); olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised outbound session");
return std::size_t(0); return std::size_t(0);
} }
@ -151,7 +151,7 @@ std::size_t olm::Session::new_inbound_session(
their_identity_key->public_key, reader.identity_key, olm::KEY_LENGTH their_identity_key->public_key, reader.identity_key, olm::KEY_LENGTH
); );
if (!same) { if (!same) {
olm::logf(olm::LOG_INFO, LOG_CATEGORY, olm_logf(OLM_LOG_INFO, LOG_CATEGORY,
"Identity key on received message is incorrect " "Identity key on received message is incorrect "
"(expected %s, got %s)", "(expected %s, got %s)",
their_identity_key->to_string().c_str(), their_identity_key->to_string().c_str(),
@ -167,7 +167,7 @@ std::size_t olm::Session::new_inbound_session(
olm::load_array(alice_base_key.public_key, reader.base_key); olm::load_array(alice_base_key.public_key, reader.base_key);
olm::load_array(bob_one_time_key.public_key, reader.one_time_key); olm::load_array(bob_one_time_key.public_key, reader.one_time_key);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY,
"Creating new inbound session from sender identity IA %s, " "Creating new inbound session from sender identity IA %s, "
"sender ephemeral EA %s, our ephemeral EB %s", "sender ephemeral EA %s, our ephemeral EB %s",
alice_identity_key.to_string().c_str(), alice_identity_key.to_string().c_str(),
@ -189,7 +189,7 @@ std::size_t olm::Session::new_inbound_session(
olm::Curve25519PublicKey ratchet_key; olm::Curve25519PublicKey ratchet_key;
olm::load_array(ratchet_key.public_key, message_reader.ratchet_key); olm::load_array(ratchet_key.public_key, message_reader.ratchet_key);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY,
"Received ratchet key T(0) %s", ratchet_key.to_string().c_str()); "Received ratchet key T(0) %s", ratchet_key.to_string().c_str());
olm::OneTimeKey const * our_one_time_key = local_account.lookup_key( olm::OneTimeKey const * our_one_time_key = local_account.lookup_key(
@ -197,7 +197,7 @@ std::size_t olm::Session::new_inbound_session(
); );
if (!our_one_time_key) { if (!our_one_time_key) {
olm::logf(olm::LOG_INFO, LOG_CATEGORY, olm_logf(OLM_LOG_INFO, LOG_CATEGORY,
"Session uses unknown ephemeral key %s", "Session uses unknown ephemeral key %s",
bob_one_time_key.to_string().c_str()); bob_one_time_key.to_string().c_str());
last_error = olm::ErrorCode::BAD_MESSAGE_KEY_ID; last_error = olm::ErrorCode::BAD_MESSAGE_KEY_ID;
@ -221,7 +221,7 @@ std::size_t olm::Session::new_inbound_session(
olm::unset(secret); olm::unset(secret);
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Initialised inbound session"); olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Initialised inbound session");
return std::size_t(0); return std::size_t(0);
} }
@ -320,7 +320,7 @@ std::size_t olm::Session::encrypt(
std::uint8_t const * random, std::size_t random_length, std::uint8_t const * random, std::size_t random_length,
std::uint8_t * message, std::size_t message_length std::uint8_t * message, std::size_t message_length
) { ) {
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Encrypting '%.*s'", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Encrypting '%.*s'",
(int)plaintext_length, plaintext); (int)plaintext_length, plaintext);
if (message_length < encrypt_message_length(plaintext_length)) { if (message_length < encrypt_message_length(plaintext_length)) {
@ -351,7 +351,7 @@ std::size_t olm::Session::encrypt(
message_body = writer.message; message_body = writer.message;
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY,
"Encoded pre-key message ver=%i one_time_key[Eb]=%s " "Encoded pre-key message ver=%i one_time_key[Eb]=%s "
"base_key[Ea]=%s identity_key[Ia]=%s", "base_key[Ea]=%s identity_key[Ia]=%s",
PROTOCOL_VERSION, PROTOCOL_VERSION,
@ -373,7 +373,7 @@ std::size_t olm::Session::encrypt(
return result; return result;
} }
olm::logf(olm::LOG_TRACE, LOG_CATEGORY, "Encrypted message %s", olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, "Encrypted message %s",
olm::bytes_to_string(message_body, result).c_str()); olm::bytes_to_string(message_body, result).c_str());
return result; return result;
@ -417,7 +417,7 @@ std::size_t olm::Session::decrypt(
std::uint8_t const * message, std::size_t message_length, std::uint8_t const * message, std::size_t message_length,
std::uint8_t * plaintext, std::size_t max_plaintext_length std::uint8_t * plaintext, std::size_t max_plaintext_length
) { ) {
olm::logf(olm::LOG_TRACE, LOG_CATEGORY, "Decrypting %smessage", olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, "Decrypting %smessage",
message_type == olm::MessageType::MESSAGE ? "" : "pre-key "); message_type == olm::MessageType::MESSAGE ? "" : "pre-key ");
std::uint8_t const * message_body; std::uint8_t const * message_body;
@ -447,7 +447,7 @@ std::size_t olm::Session::decrypt(
} }
received_message = true; received_message = true;
olm::logf(olm::LOG_DEBUG, LOG_CATEGORY, "Decrypted '%.*s'", olm_logf(OLM_LOG_DEBUG, LOG_CATEGORY, "Decrypted '%.*s'",
(int)result, plaintext); (int)result, plaintext);
return result; return result;
} }