From 444ef1f70687c340ba1b0b2a22d6e63c734d5f9e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 20 May 2016 11:59:31 +0100
Subject: Prefix for internal symbols

Give a load of internal symbols "_olm_" prefixes. This better delineates the
public and private interfaces in the module, and helps avoid internal symbols
leaking out and possibly being abused.
---
 tests/test_base64.cpp  | 8 ++++----
 tests/test_crypto.cpp  | 8 ++++----
 tests/test_ratchet.cpp | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests')

diff --git a/tests/test_base64.cpp b/tests/test_base64.cpp
index a1efe17..c95e3c9 100644
--- a/tests/test_base64.cpp
+++ b/tests/test_base64.cpp
@@ -26,11 +26,11 @@ std::uint8_t input[] = "Hello World";
 std::uint8_t expected_output[] = "SGVsbG8gV29ybGQ";
 std::size_t input_length = sizeof(input) - 1;
 
-std::size_t output_length = ::olm_encode_base64_length(input_length);
+std::size_t output_length = ::_olm_encode_base64_length(input_length);
 assert_equals(std::size_t(15), output_length);
 
 std::uint8_t output[output_length];
-output_length = ::olm_encode_base64(input, input_length, output);
+output_length = ::_olm_encode_base64(input, input_length, output);
 assert_equals(std::size_t(15), output_length);
 assert_equals(expected_output, output, output_length);
 }
@@ -57,11 +57,11 @@ std::uint8_t input[] = "SGVsbG8gV29ybGQ";
 std::uint8_t expected_output[] = "Hello World";
 std::size_t input_length = sizeof(input) - 1;
 
-std::size_t output_length = ::olm_decode_base64_length(input_length);
+std::size_t output_length = ::_olm_decode_base64_length(input_length);
 assert_equals(std::size_t(11), output_length);
 
 std::uint8_t output[output_length];
-output_length = ::olm_decode_base64(input, input_length, output);
+output_length = ::_olm_decode_base64(input, input_length, output);
 assert_equals(std::size_t(11), output_length);
 assert_equals(expected_output, output, output_length);
 }
diff --git a/tests/test_crypto.cpp b/tests/test_crypto.cpp
index e86f3ab..1041538 100644
--- a/tests/test_crypto.cpp
+++ b/tests/test_crypto.cpp
@@ -186,7 +186,7 @@ std::uint8_t expected[32] = {
 
 std::uint8_t actual[32];
 
-crypto_sha256(input, sizeof(input), actual);
+_olm_crypto_sha256(input, sizeof(input), actual);
 
 assert_equals(expected, actual, 32);
 
@@ -207,7 +207,7 @@ std::uint8_t expected[32] = {
 
 std::uint8_t actual[32];
 
-crypto_hmac_sha256(input, sizeof(input), input, sizeof(input), actual);
+_olm_crypto_hmac_sha256(input, sizeof(input), input, sizeof(input), actual);
 
 assert_equals(expected, actual, 32);
 
@@ -242,7 +242,7 @@ std::uint8_t hmac_expected_output[32] = {
 
 std::uint8_t hmac_actual_output[32] = {};
 
-crypto_hmac_sha256(
+_olm_crypto_hmac_sha256(
     salt, sizeof(salt),
     input, sizeof(input),
     hmac_actual_output
@@ -261,7 +261,7 @@ std::uint8_t hkdf_expected_output[42] = {
 
 std::uint8_t hkdf_actual_output[42] = {};
 
-crypto_hkdf_sha256(
+_olm_crypto_hkdf_sha256(
     input, sizeof(input),
     salt, sizeof(salt),
     info, sizeof(info),
diff --git a/tests/test_ratchet.cpp b/tests/test_ratchet.cpp
index 2c8bc1b..3997eb3 100644
--- a/tests/test_ratchet.cpp
+++ b/tests/test_ratchet.cpp
@@ -28,8 +28,8 @@ olm::KdfInfo kdf_info = {
     ratchet_info, sizeof(ratchet_info) - 1
 };
 
-olm_cipher_aes_sha_256 cipher0;
-olm_cipher *cipher = olm_cipher_aes_sha_256_init(
+_olm_cipher_aes_sha_256 cipher0;
+_olm_cipher *cipher = _olm_cipher_aes_sha_256_init(
     &cipher0, message_info, sizeof(message_info) - 1
 );
 
-- 
cgit v1.2.3