From b3db0e6ee14315d20ca91eff91e348e18dd119e6 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 13 May 2016 11:53:33 +0100 Subject: translate logging.cpp to C --- src/message.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/message.cpp') diff --git a/src/message.cpp b/src/message.cpp index 23ec823..ff03903 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -14,7 +14,7 @@ */ #include "olm/message.hh" -#include "olm/logging.hh" +#include "olm/logging.h" #include "olm/memory.hh" namespace { @@ -239,7 +239,7 @@ void olm::decode_message( } 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", reader.version, 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; } - 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 " "base_key[Ea]=%s identity_key[Ia]=%s message=%s", reader.version, -- cgit v1.2.3 From 3965320a9ce2a41a96b962e8f5bf396f328d1aad Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Mon, 16 May 2016 11:13:54 +0100 Subject: Remove logging functionality Concerns have been raised that including logging functionality makes it harder to audit the implementation to ensure that no secret information is leaked. We are therefore removing it from the master branch. --- src/message.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/message.cpp') diff --git a/src/message.cpp b/src/message.cpp index ff03903..1c93eb8 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -14,13 +14,10 @@ */ #include "olm/message.hh" -#include "olm/logging.h" #include "olm/memory.hh" namespace { -static const char *LOG_CATEGORY = "olm::Message"; - template static std::size_t varint_length( T value @@ -239,13 +236,6 @@ void olm::decode_message( } unknown = pos; } - olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, - "Decoded message ver=%i ratchet_key=%s chain_idx=%i ciphertext=%s", - reader.version, - olm::bytes_to_string(reader.ratchet_key, reader.ratchet_key_length).c_str(), - reader.has_counter ? reader.counter : -1, - olm::bytes_to_string(reader.ciphertext, reader.ciphertext_length).c_str() - ); } @@ -334,14 +324,4 @@ void olm::decode_one_time_key_message( } unknown = pos; } - - olm_logf(OLM_LOG_TRACE, LOG_CATEGORY, - "Decoded pre-key message ver=%i one_time_key[Eb]=%s " - "base_key[Ea]=%s identity_key[Ia]=%s message=%s", - reader.version, - olm::bytes_to_string(reader.one_time_key, reader.one_time_key_length).c_str(), - olm::bytes_to_string(reader.base_key, reader.base_key_length).c_str(), - olm::bytes_to_string(reader.identity_key, reader.identity_key_length).c_str(), - olm::bytes_to_string(reader.message, reader.message_length).c_str() - ); } -- cgit v1.2.3