diff options
Diffstat (limited to 'include/olm/account.hh')
| -rw-r--r-- | include/olm/account.hh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/olm/account.hh b/include/olm/account.hh index 209139a..7e58ca3 100644 --- a/include/olm/account.hh +++ b/include/olm/account.hh @@ -16,8 +16,8 @@ #define OLM_ACCOUNT_HH_ #include "olm/list.hh" -#include "olm/crypto.hh" -#include "olm/error.hh" +#include "olm/crypto.h" +#include "olm/error.h" #include <cstdint> @@ -25,14 +25,14 @@ namespace olm { struct IdentityKeys { - Ed25519KeyPair ed25519_key; - Curve25519KeyPair curve25519_key; + _olm_ed25519_key_pair ed25519_key; + _olm_curve25519_key_pair curve25519_key; }; struct OneTimeKey { std::uint32_t id; bool published; - Curve25519KeyPair key; + _olm_curve25519_key_pair key; }; @@ -44,7 +44,7 @@ struct Account { IdentityKeys identity_keys; List<OneTimeKey, MAX_ONE_TIME_KEYS> one_time_keys; std::uint32_t next_one_time_key_id; - ErrorCode last_error; + OlmErrorCode last_error; /** Number of random bytes needed to create a new account */ std::size_t new_account_random_length(); @@ -128,12 +128,12 @@ struct Account { /** Lookup a one time key with the given public key */ OneTimeKey const * lookup_key( - Curve25519PublicKey const & public_key + _olm_curve25519_public_key const & public_key ); /** Remove a one time key with the given public key */ std::size_t remove_key( - Curve25519PublicKey const & public_key + _olm_curve25519_public_key const & public_key ); }; |