aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-07-08 16:00:08 +0100
committerMark Haines <mark.haines@matrix.org>2015-07-08 16:04:18 +0100
commit0e988237f6fcb826afc42719adc335dcc7ca0e2e (patch)
tree004312c4b121b2278a5327847db28f0c20639323 /include
parent532dc0d4e79192a0c7fd1758322f6cae06959859 (diff)
Don't pass a key id when creating a new outbound session
Diffstat (limited to 'include')
-rw-r--r--include/olm/account.hh5
-rw-r--r--include/olm/session.hh1
2 files changed, 3 insertions, 3 deletions
diff --git a/include/olm/account.hh b/include/olm/account.hh
index 552f069..cf886d1 100644
--- a/include/olm/account.hh
+++ b/include/olm/account.hh
@@ -112,13 +112,14 @@ struct Account {
std::uint8_t * one_time_json, std::size_t one_time_json_length
);
- /** Lookup a one_time key with the given key-id */
+ /** Lookup a one time key with the given public key */
OneTimeKey const * lookup_key(
Curve25519PublicKey const & public_key
);
+ /** Remove a one time key with the given public key */
std::size_t remove_key(
- std::uint32_t id
+ Curve25519PublicKey const & public_key
);
};
diff --git a/include/olm/session.hh b/include/olm/session.hh
index 1c04108..125df68 100644
--- a/include/olm/session.hh
+++ b/include/olm/session.hh
@@ -38,7 +38,6 @@ struct Session {
Curve25519PublicKey alice_identity_key;
Curve25519PublicKey alice_base_key;
Curve25519PublicKey bob_one_time_key;
- std::uint32_t bob_one_time_key_id;
std::size_t new_outbound_session_random_length();