aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-24 14:54:01 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-24 14:54:01 +0100
commita919a149fbb192e3fae7aba921ca28e02d9c0d10 (patch)
tree482f05d70d330d21934d296ec1d26e126b1a1732 /include
parentfa1e9446ac2b4d26dd592813ce0a372565df4c93 (diff)
Update megolm_cipher as a global struct
Initialise megolm_cipher via the preprocessor macro, instead of with a function.
Diffstat (limited to 'include')
-rw-r--r--include/olm/megolm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/olm/megolm.h b/include/olm/megolm.h
index 831c6fb..e4e5d0b 100644
--- a/include/olm/megolm.h
+++ b/include/olm/megolm.h
@@ -49,11 +49,11 @@ typedef struct Megolm {
/**
- * Get the cipher used in megolm-backed conversations
+ * The cipher used in megolm-backed conversations
*
* (AES256 + SHA256, with keys based on an HKDF with info of MEGOLM_KEYS)
*/
-const struct _olm_cipher *megolm_cipher();
+extern const struct _olm_cipher *megolm_cipher;
/**
* initialize the megolm ratchet. random_data should be at least