X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/a6eff84624ab1f3786d02aa2ec740b9a88090d94..464bfb1912d0806143386f61c33dd45fbafc38e8:/src/matrix.h

diff --git a/src/matrix.h b/src/matrix.h
index 72e865f..91ed208 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -21,6 +21,7 @@
 #define OLM_IDENTITY_KEYS_JSON_SIZE 128
 #define DEVICE_KEY_SIZE 44
 #define SIGNING_KEY_SIZE 44
+#define ONETIME_KEY_SIZE 44
 
 #define KEY_SHARE_EVENT_LEN 1024
 
@@ -29,8 +30,9 @@
 
 #define OLM_SESSION_MEMORY_SIZE 3352
 #define OLM_ENCRYPT_RANDOM_SIZE 32
+#define OLM_OUTBOUND_SESSION_RANDOM_SIZE (32*2)
 
-#define OLM_ONETIME_KEYS_RANDOM_SIZE 32*10
+#define OLM_ONETIME_KEYS_RANDOM_SIZE (32*10)
 #define OLM_KEY_ID_SIZE 32
 
 #define OLM_SIGNATURE_SIZE 128
@@ -48,18 +50,6 @@
 #define NUM_OLM_SESSIONS 10
 #define NUM_DEVICES 10
 
-void
-Randomize(uint8_t * random, int randomLen);
-
-bool
-JsonEscape(
-    char * sIn, int sInLen,
-    char * sOut, int sOutCap);
-    
-bool JsonSign(
-    char * sIn, int sInLen,
-    char * sOut, int sOutCap);
-
 // Matrix Device
 
 typedef struct MatrixDevice {
@@ -91,9 +81,12 @@ typedef struct MatrixOlmSession {
 } MatrixOlmSession;
 
 bool
-MatrixOlmSessionInit(
+MatrixOlmSessionTo(
     MatrixOlmSession * session,
-    const char * deviceId);
+    OlmAccount * olmAccount,
+    const char * deviceId,
+    const char * deviceKey,
+    const char * deviceOnetimeKey);
 
 bool
 MatrixOlmSessionEncrypt(
@@ -163,6 +156,16 @@ MatrixClientInit(
     MatrixClient * client,
     const char * server);
 
+bool
+MatrixClientSave(
+    MatrixClient * client,
+    const char * filename);
+
+bool
+MatrixClientLoad(
+    MatrixClient * client,
+    const char * filename);
+
 bool
 MatrixClientSetAccessToken(
     MatrixClient * client,
@@ -191,6 +194,13 @@ bool
 MatrixClientUploadDeviceKeys(
     MatrixClient * client);
 
+bool
+MatrixClientClaimOnetimeKey(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    char * outOnetimeKey, int outOnetimeKeyCap);
+
 bool
 MatrixClientLoginPassword(
     MatrixClient * client,
@@ -215,11 +225,12 @@ MatrixClientSendEventEncrypted(
 bool
 MatrixClientSync(
     MatrixClient * client,
-    char * outSyncBuffer, int outSyncCap);
+    char * outSync, int outSyncCap);
 
 bool
 MatrixClientShareMegolmOutSession(
     MatrixClient * client,
+    const char * userId,
     const char * deviceId,
     MatrixMegolmOutSession * session);
 
@@ -244,6 +255,7 @@ MatrixClientSetMegolmOutSession(
 bool
 MatrixClientGetOlmSession(
     MatrixClient * client,
+    const char * userId,
     const char * deviceId,
     MatrixOlmSession ** outSession);
 
@@ -281,6 +293,7 @@ MatrixClientRequestDeviceKeys(
 
 
 
+
 bool
 MatrixHttpInit(
     MatrixClient * client);
@@ -316,4 +329,19 @@ MatrixHttpPut(
     char * outResponseBuffer, int outResponseCap,
     bool authenticated);
 
+// util
+
+void
+Randomize(uint8_t * random, int randomLen);
+
+bool
+JsonEscape(
+    const char * sIn, int sInLen,
+    char * sOut, int sOutCap);
+    
+bool JsonSign(
+    MatrixClient * client,
+    const char * sIn, int sInLen,
+    char * sOut, int sOutCap);
+
 #endif