diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-05-24 13:33:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-05-24 13:33:33 +0100 |
| commit | 2e7800cf650197f4b8998ef8ac24d08daa316a2f (patch) | |
| tree | 1f9e5e06b755f929c7bad363b77eaafdd21d706c /include/olm/ratchet.hh | |
| parent | b1c5732fc8c89ee9217d0f54408f860565fa01f4 (diff) | |
| parent | 2fd28a66824bda7b86c08b065736009c39761987 (diff) | |
Merge branch 'rav/c_bindings'
Diffstat (limited to 'include/olm/ratchet.hh')
| -rw-r--r-- | include/olm/ratchet.hh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/olm/ratchet.hh b/include/olm/ratchet.hh index 071e349..acb5608 100644 --- a/include/olm/ratchet.hh +++ b/include/olm/ratchet.hh @@ -15,11 +15,11 @@ #include "olm/crypto.hh" #include "olm/list.hh" -#include "olm/error.hh" +#include "olm/error.h" -namespace olm { +struct _olm_cipher; -class Cipher; +namespace olm { typedef std::uint8_t SharedKey[olm::KEY_LENGTH]; @@ -69,17 +69,17 @@ struct Ratchet { Ratchet( KdfInfo const & kdf_info, - Cipher const & ratchet_cipher + _olm_cipher const *ratchet_cipher ); /** A some strings identifying the application to feed into the KDF. */ KdfInfo const & kdf_info; /** The AEAD cipher to use for encrypting messages. */ - Cipher const & ratchet_cipher; + _olm_cipher const *ratchet_cipher; /** The last error that happened encrypting or decrypting a message. */ - ErrorCode last_error; + OlmErrorCode last_error; /** * A count of the number of times the root key has been advanced; this is |