X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/f2840d9dd5b8a0683abee189e408c5a6de294eb7..c7aba5979c820958aa08947903afb47ace496a16:/src/matrix.h

diff --git a/src/matrix.h b/src/matrix.h
index 5963d7d..3614b6a 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -11,6 +11,7 @@
 
 
 #define USER_ID_SIZE 64
+#define ROOM_ID_SIZE 128
 #define SERVER_SIZE 20
 #define ACCESS_TOKEN_SIZE 40
 #define DEVICE_ID_SIZE 20
@@ -50,18 +51,6 @@
 #define NUM_OLM_SESSIONS 10
 #define NUM_DEVICES 10
 
-void
-Randomize(uint8_t * random, int randomLen);
-
-bool
-JsonEscape(
-    const char * sIn, int sInLen,
-    char * sOut, int sOutCap);
-    
-bool JsonSign(
-    const char * sIn, int sInLen,
-    char * sOut, int sOutCap);
-
 // Matrix Device
 
 typedef struct MatrixDevice {
@@ -93,7 +82,7 @@ typedef struct MatrixOlmSession {
 } MatrixOlmSession;
 
 bool
-MatrixOlmSessionFrom(
+MatrixOlmSessionTo(
     MatrixOlmSession * session,
     OlmAccount * olmAccount,
     const char * deviceId,
@@ -114,7 +103,7 @@ typedef struct MatrixMegolmInSession {
 } MatrixMegolmInSession;
 
 typedef struct MatrixMegolmOutSession {
-    const char * roomId;
+    char roomId[ROOM_ID_SIZE];
 
     OlmOutboundGroupSession * session;
     char memory[MEGOLM_OUTBOUND_SESSION_MEMORY_SIZE];
@@ -127,13 +116,25 @@ bool
 MatrixMegolmOutSessionInit(
     MatrixMegolmOutSession * session,
     const char * roomId);
-    
+
 bool
 MatrixMegolmOutSessionEncrypt(
     MatrixMegolmOutSession * session,
     const char * plaintext,
     char * outBuffer, int outBufferCap);
 
+bool
+MatrixMegolmOutSessionSave(
+    MatrixMegolmOutSession * session,
+    const char * filename,
+    const char * key);
+    
+bool
+MatrixMegolmOutSessionLoad(
+    MatrixMegolmOutSession * session,
+    const char * filename,
+    const char * key);
+
 
 // Matrix Client
 
@@ -168,6 +169,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,
@@ -254,6 +265,11 @@ MatrixClientSetMegolmOutSession(
     const char * roomId,
     MatrixMegolmOutSession session);
 
+bool
+MatrixClientInitMegolmOutSession(
+    MatrixClient * client,
+    const char * roomId);
+
 bool
 MatrixClientGetOlmSession(
     MatrixClient * client,
@@ -295,6 +311,7 @@ MatrixClientRequestDeviceKeys(
 
 
 
+
 bool
 MatrixHttpInit(
     MatrixClient * client);
@@ -330,4 +347,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