aboutsummaryrefslogtreecommitdiff
path: root/src/session.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/session.cpp')
-rw-r--r--src/session.cpp170
1 files changed, 85 insertions, 85 deletions
diff --git a/src/session.cpp b/src/session.cpp
index 9d0935b..a028431 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -12,13 +12,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "axolotl/session.hh"
-#include "axolotl/cipher.hh"
-#include "axolotl/crypto.hh"
-#include "axolotl/account.hh"
-#include "axolotl/memory.hh"
-#include "axolotl/message.hh"
-#include "axolotl/pickle.hh"
+#include "olm/session.hh"
+#include "olm/cipher.hh"
+#include "olm/crypto.hh"
+#include "olm/account.hh"
+#include "olm/memory.hh"
+#include "olm/message.hh"
+#include "olm/pickle.hh"
#include <cstring>
@@ -27,51 +27,51 @@ namespace {
static const std::size_t KEY_LENGTH = 32;
static const std::uint8_t PROTOCOL_VERSION = 0x3;
-static const std::uint8_t ROOT_KDF_INFO[] = "AXOLOTL_ROOT";
-static const std::uint8_t RATCHET_KDF_INFO[] = "AXOLOTL_RATCHET";
-static const std::uint8_t CIPHER_KDF_INFO[] = "AXOLOTL_KEYS";
+static const std::uint8_t ROOT_KDF_INFO[] = "OLM_ROOT";
+static const std::uint8_t RATCHET_KDF_INFO[] = "OLM_RATCHET";
+static const std::uint8_t CIPHER_KDF_INFO[] = "OLM_KEYS";
-static const axolotl::CipherAesSha256 AXOLOTL_CIPHER(
+static const olm::CipherAesSha256 OLM_CIPHER(
CIPHER_KDF_INFO, sizeof(CIPHER_KDF_INFO) -1
);
-static const axolotl::KdfInfo AXOLOTL_KDF_INFO = {
+static const olm::KdfInfo OLM_KDF_INFO = {
ROOT_KDF_INFO, sizeof(ROOT_KDF_INFO) - 1,
RATCHET_KDF_INFO, sizeof(RATCHET_KDF_INFO) - 1
};
} // namespace
-axolotl::Session::Session(
-) : ratchet(AXOLOTL_KDF_INFO, AXOLOTL_CIPHER),
- last_error(axolotl::ErrorCode::SUCCESS),
+olm::Session::Session(
+) : ratchet(OLM_KDF_INFO, OLM_CIPHER),
+ last_error(olm::ErrorCode::SUCCESS),
received_message(false),
bob_one_time_key_id(0) {
}
-std::size_t axolotl::Session::new_outbound_session_random_length() {
+std::size_t olm::Session::new_outbound_session_random_length() {
return KEY_LENGTH * 2;
}
-std::size_t axolotl::Session::new_outbound_session(
- axolotl::Account const & local_account,
- axolotl::Curve25519PublicKey const & identity_key,
- axolotl::RemoteKey const & one_time_key,
+std::size_t olm::Session::new_outbound_session(
+ olm::Account const & local_account,
+ olm::Curve25519PublicKey const & identity_key,
+ olm::RemoteKey const & one_time_key,
std::uint8_t const * random, std::size_t random_length
) {
if (random_length < new_outbound_session_random_length()) {
- last_error = axolotl::ErrorCode::NOT_ENOUGH_RANDOM;
+ last_error = olm::ErrorCode::NOT_ENOUGH_RANDOM;
return std::size_t(-1);
}
Curve25519KeyPair base_key;
- axolotl::generate_key(random, base_key);
+ olm::generate_key(random, base_key);
Curve25519KeyPair ratchet_key;
- axolotl::generate_key(random + 32, ratchet_key);
+ olm::generate_key(random + 32, ratchet_key);
received_message = false;
alice_identity_key.id = local_account.identity_key.id;
@@ -81,21 +81,21 @@ std::size_t axolotl::Session::new_outbound_session(
std::uint8_t shared_secret[96];
- axolotl::curve25519_shared_secret(
+ olm::curve25519_shared_secret(
local_account.identity_key.key, one_time_key.key, shared_secret
);
- axolotl::curve25519_shared_secret(
+ olm::curve25519_shared_secret(
base_key, identity_key, shared_secret + 32
);
- axolotl::curve25519_shared_secret(
+ olm::curve25519_shared_secret(
base_key, one_time_key.key, shared_secret + 64
);
ratchet.initialise_as_alice(shared_secret, 96, ratchet_key);
- axolotl::unset(base_key);
- axolotl::unset(ratchet_key);
- axolotl::unset(shared_secret);
+ olm::unset(base_key);
+ olm::unset(ratchet_key);
+ olm::unset(shared_secret);
return std::size_t(0);
}
@@ -103,7 +103,7 @@ std::size_t axolotl::Session::new_outbound_session(
namespace {
bool check_message_fields(
- axolotl::PreKeyMessageReader & reader
+ olm::PreKeyMessageReader & reader
) {
bool ok = true;
ok = ok && reader.identity_key;
@@ -118,19 +118,19 @@ bool check_message_fields(
} // namespace
-std::size_t axolotl::Session::new_inbound_session(
- axolotl::Account & local_account,
+std::size_t olm::Session::new_inbound_session(
+ olm::Account & local_account,
std::uint8_t const * one_time_key_message, std::size_t message_length
) {
- axolotl::PreKeyMessageReader reader;
+ olm::PreKeyMessageReader reader;
decode_one_time_key_message(reader, one_time_key_message, message_length);
if (!check_message_fields(reader)) {
- last_error = axolotl::ErrorCode::BAD_MESSAGE_FORMAT;
+ last_error = olm::ErrorCode::BAD_MESSAGE_FORMAT;
return std::size_t(-1);
}
- axolotl::MessageReader message_reader;
+ olm::MessageReader message_reader;
decode_message(
message_reader, reader.message, reader.message_length,
ratchet.ratchet_cipher.mac_length()
@@ -138,34 +138,34 @@ std::size_t axolotl::Session::new_inbound_session(
if (!message_reader.ratchet_key
|| message_reader.ratchet_key_length != KEY_LENGTH) {
- last_error = axolotl::ErrorCode::BAD_MESSAGE_FORMAT;
+ last_error = olm::ErrorCode::BAD_MESSAGE_FORMAT;
return std::size_t(-1);
}
std::memcpy(alice_identity_key.key.public_key, reader.identity_key, 32);
std::memcpy(alice_base_key.public_key, reader.base_key, 32);
bob_one_time_key_id = reader.one_time_key_id;
- axolotl::Curve25519PublicKey ratchet_key;
+ olm::Curve25519PublicKey ratchet_key;
std::memcpy(ratchet_key.public_key, message_reader.ratchet_key, 32);
- axolotl::LocalKey const * bob_one_time_key = local_account.lookup_key(
+ olm::LocalKey const * bob_one_time_key = local_account.lookup_key(
bob_one_time_key_id
);
if (!bob_one_time_key) {
- last_error = axolotl::ErrorCode::BAD_MESSAGE_KEY_ID;
+ last_error = olm::ErrorCode::BAD_MESSAGE_KEY_ID;
return std::size_t(-1);
}
std::uint8_t shared_secret[96];
- axolotl::curve25519_shared_secret(
+ olm::curve25519_shared_secret(
bob_one_time_key->key, alice_identity_key.key, shared_secret
);
- axolotl::curve25519_shared_secret(
+ olm::curve25519_shared_secret(
local_account.identity_key.key, alice_base_key, shared_secret + 32
);
- axolotl::curve25519_shared_secret(
+ olm::curve25519_shared_secret(
bob_one_time_key->key, alice_base_key, shared_secret + 64
);
@@ -175,10 +175,10 @@ std::size_t axolotl::Session::new_inbound_session(
}
-bool axolotl::Session::matches_inbound_session(
+bool olm::Session::matches_inbound_session(
std::uint8_t const * one_time_key_message, std::size_t message_length
) {
- axolotl::PreKeyMessageReader reader;
+ olm::PreKeyMessageReader reader;
decode_one_time_key_message(reader, one_time_key_message, message_length);
if (!check_message_fields(reader)) {
@@ -197,16 +197,16 @@ bool axolotl::Session::matches_inbound_session(
}
-axolotl::MessageType axolotl::Session::encrypt_message_type() {
+olm::MessageType olm::Session::encrypt_message_type() {
if (received_message) {
- return axolotl::MessageType::MESSAGE;
+ return olm::MessageType::MESSAGE;
} else {
- return axolotl::MessageType::PRE_KEY;
+ return olm::MessageType::PRE_KEY;
}
}
-std::size_t axolotl::Session::encrypt_message_length(
+std::size_t olm::Session::encrypt_message_length(
std::size_t plaintext_length
) {
std::size_t message_length = ratchet.encrypt_output_length(
@@ -226,18 +226,18 @@ std::size_t axolotl::Session::encrypt_message_length(
}
-std::size_t axolotl::Session::encrypt_random_length() {
+std::size_t olm::Session::encrypt_random_length() {
return ratchet.encrypt_random_length();
}
-std::size_t axolotl::Session::encrypt(
+std::size_t olm::Session::encrypt(
std::uint8_t const * plaintext, std::size_t plaintext_length,
std::uint8_t const * random, std::size_t random_length,
std::uint8_t * message, std::size_t message_length
) {
if (message_length < encrypt_message_length(plaintext_length)) {
- last_error = axolotl::ErrorCode::OUTPUT_BUFFER_TOO_SMALL;
+ last_error = olm::ErrorCode::OUTPUT_BUFFER_TOO_SMALL;
return std::size_t(-1);
}
std::uint8_t * message_body;
@@ -248,7 +248,7 @@ std::size_t axolotl::Session::encrypt(
if (received_message) {
message_body = message;
} else {
- axolotl::PreKeyMessageWriter writer;
+ olm::PreKeyMessageWriter writer;
encode_one_time_key_message(
writer,
PROTOCOL_VERSION,
@@ -275,26 +275,26 @@ std::size_t axolotl::Session::encrypt(
if (result == std::size_t(-1)) {
last_error = ratchet.last_error;
- ratchet.last_error = axolotl::ErrorCode::SUCCESS;
+ ratchet.last_error = olm::ErrorCode::SUCCESS;
}
return result;
}
-std::size_t axolotl::Session::decrypt_max_plaintext_length(
+std::size_t olm::Session::decrypt_max_plaintext_length(
MessageType message_type,
std::uint8_t const * message, std::size_t message_length
) {
std::uint8_t const * message_body;
std::size_t message_body_length;
- if (message_type == axolotl::MessageType::MESSAGE) {
+ if (message_type == olm::MessageType::MESSAGE) {
message_body = message;
message_body_length = message_length;
} else {
- axolotl::PreKeyMessageReader reader;
+ olm::PreKeyMessageReader reader;
decode_one_time_key_message(reader, message, message_length);
if (!reader.message) {
- last_error = axolotl::ErrorCode::BAD_MESSAGE_FORMAT;
+ last_error = olm::ErrorCode::BAD_MESSAGE_FORMAT;
return std::size_t(-1);
}
message_body = reader.message;
@@ -307,27 +307,27 @@ std::size_t axolotl::Session::decrypt_max_plaintext_length(
if (result == std::size_t(-1)) {
last_error = ratchet.last_error;
- ratchet.last_error = axolotl::ErrorCode::SUCCESS;
+ ratchet.last_error = olm::ErrorCode::SUCCESS;
}
return result;
}
-std::size_t axolotl::Session::decrypt(
- axolotl::MessageType message_type,
+std::size_t olm::Session::decrypt(
+ olm::MessageType message_type,
std::uint8_t const * message, std::size_t message_length,
std::uint8_t * plaintext, std::size_t max_plaintext_length
) {
std::uint8_t const * message_body;
std::size_t message_body_length;
- if (message_type == axolotl::MessageType::MESSAGE) {
+ if (message_type == olm::MessageType::MESSAGE) {
message_body = message;
message_body_length = message_length;
} else {
- axolotl::PreKeyMessageReader reader;
+ olm::PreKeyMessageReader reader;
decode_one_time_key_message(reader, message, message_length);
if (!reader.message) {
- last_error = axolotl::ErrorCode::BAD_MESSAGE_FORMAT;
+ last_error = olm::ErrorCode::BAD_MESSAGE_FORMAT;
return std::size_t(-1);
}
message_body = reader.message;
@@ -340,7 +340,7 @@ std::size_t axolotl::Session::decrypt(
if (result == std::size_t(-1)) {
last_error = ratchet.last_error;
- ratchet.last_error = axolotl::ErrorCode::SUCCESS;
+ ratchet.last_error = olm::ErrorCode::SUCCESS;
} else {
received_message = true;
}
@@ -348,44 +348,44 @@ std::size_t axolotl::Session::decrypt(
}
-std::size_t axolotl::pickle_length(
+std::size_t olm::pickle_length(
Session const & value
) {
std::size_t length = 0;
- length += axolotl::pickle_length(value.received_message);
- length += axolotl::pickle_length(value.alice_identity_key.id);
- length += axolotl::pickle_length(value.alice_identity_key.key);
- length += axolotl::pickle_length(value.alice_base_key);
- length += axolotl::pickle_length(value.bob_one_time_key_id);
- length += axolotl::pickle_length(value.ratchet);
+ length += olm::pickle_length(value.received_message);
+ length += olm::pickle_length(value.alice_identity_key.id);
+ length += olm::pickle_length(value.alice_identity_key.key);
+ length += olm::pickle_length(value.alice_base_key);
+ length += olm::pickle_length(value.bob_one_time_key_id);
+ length += olm::pickle_length(value.ratchet);
return length;
}
-std::uint8_t * axolotl::pickle(
+std::uint8_t * olm::pickle(
std::uint8_t * pos,
Session const & value
) {
- pos = axolotl::pickle(pos, value.received_message);
- pos = axolotl::pickle(pos, value.alice_identity_key.id);
- pos = axolotl::pickle(pos, value.alice_identity_key.key);
- pos = axolotl::pickle(pos, value.alice_base_key);
- pos = axolotl::pickle(pos, value.bob_one_time_key_id);
- pos = axolotl::pickle(pos, value.ratchet);
+ pos = olm::pickle(pos, value.received_message);
+ pos = olm::pickle(pos, value.alice_identity_key.id);
+ pos = olm::pickle(pos, value.alice_identity_key.key);
+ pos = olm::pickle(pos, value.alice_base_key);
+ pos = olm::pickle(pos, value.bob_one_time_key_id);
+ pos = olm::pickle(pos, value.ratchet);
return pos;
}
-std::uint8_t const * axolotl::unpickle(
+std::uint8_t const * olm::unpickle(
std::uint8_t const * pos, std::uint8_t const * end,
Session & value
) {
- pos = axolotl::unpickle(pos, end, value.received_message);
- pos = axolotl::unpickle(pos, end, value.alice_identity_key.id);
- pos = axolotl::unpickle(pos, end, value.alice_identity_key.key);
- pos = axolotl::unpickle(pos, end, value.alice_base_key);
- pos = axolotl::unpickle(pos, end, value.bob_one_time_key_id);
- pos = axolotl::unpickle(pos, end, value.ratchet);
+ pos = olm::unpickle(pos, end, value.received_message);
+ pos = olm::unpickle(pos, end, value.alice_identity_key.id);
+ pos = olm::unpickle(pos, end, value.alice_identity_key.key);
+ pos = olm::unpickle(pos, end, value.alice_base_key);
+ pos = olm::unpickle(pos, end, value.bob_one_time_key_id);
+ pos = olm::unpickle(pos, end, value.ratchet);
return pos;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 21:51:40 +0000