From 09d4125ff164f5ca686d12ccb0790c35ce721a6b Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 Jun 2015 01:15:23 +0200
Subject: Rename axolotlpp as olm to avoid confusion with Axolotl-the-spec and
 Axolotl-the-OWS-libraries at moxie's request

---
 src/message.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/message.cpp')

diff --git a/src/message.cpp b/src/message.cpp
index 343b094..af43916 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "axolotl/message.hh"
+#include "olm/message.hh"
 
 namespace {
 
@@ -161,7 +161,7 @@ std::uint8_t const * skip_unknown(
 } // namespace
 
 
-std::size_t axolotl::encode_message_length(
+std::size_t olm::encode_message_length(
     std::uint32_t counter,
     std::size_t ratchet_key_length,
     std::size_t ciphertext_length,
@@ -176,8 +176,8 @@ std::size_t axolotl::encode_message_length(
 }
 
 
-void axolotl::encode_message(
-    axolotl::MessageWriter & writer,
+void olm::encode_message(
+    olm::MessageWriter & writer,
     std::uint8_t version,
     std::uint32_t counter,
     std::size_t ratchet_key_length,
@@ -192,8 +192,8 @@ void axolotl::encode_message(
 }
 
 
-void axolotl::decode_message(
-    axolotl::MessageReader & reader,
+void olm::decode_message(
+    olm::MessageReader & reader,
     std::uint8_t const * input, std::size_t input_length,
     std::size_t mac_length
 ) {
@@ -240,7 +240,7 @@ static std::uint8_t const MESSAGE_TAG = 042;
 } // namespace
 
 
-std::size_t axolotl::encode_one_time_key_message_length(
+std::size_t olm::encode_one_time_key_message_length(
     std::uint32_t one_time_key_id,
     std::size_t identity_key_length,
     std::size_t base_key_length,
@@ -255,8 +255,8 @@ std::size_t axolotl::encode_one_time_key_message_length(
 }
 
 
-void axolotl::encode_one_time_key_message(
-    axolotl::PreKeyMessageWriter & writer,
+void olm::encode_one_time_key_message(
+    olm::PreKeyMessageWriter & writer,
     std::uint8_t version,
     std::uint32_t one_time_key_id,
     std::size_t identity_key_length,
@@ -273,7 +273,7 @@ void axolotl::encode_one_time_key_message(
 }
 
 
-void axolotl::decode_one_time_key_message(
+void olm::decode_one_time_key_message(
     PreKeyMessageReader & reader,
     std::uint8_t const * input, std::size_t input_length
 ) {
-- 
cgit v1.2.3