X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/c7aba5979c820958aa08947903afb47ace496a16..504241758d7b832af61939beaf61b0e0574174c4:/src/matrix.h?ds=inline

diff --git a/src/matrix.h b/src/matrix.h
index 3614b6a..da0e859 100644
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -17,7 +17,7 @@
 #define DEVICE_ID_SIZE 20
 #define EXPIRE_MS_SIZE 20
 #define REFRESH_TOKEN_SIZE 20
-#define MAX_URL_LEN 128
+#define MAX_URL_LEN 1024
 
 #define OLM_IDENTITY_KEYS_JSON_SIZE 128
 #define DEVICE_KEY_SIZE 44
@@ -56,6 +56,7 @@
 typedef struct MatrixDevice {
     char deviceId[DEVICE_ID_SIZE];
     char deviceKey[DEVICE_KEY_SIZE];
+    char signingKey[SIGNING_KEY_SIZE];
 } MatrixDevice;
 
 
@@ -70,17 +71,40 @@ bool
 MatrixOlmAccountInit(
     MatrixOlmAccount * account);
 
+bool
+MatrixOlmAccountUnpickle(
+    MatrixOlmAccount * account,
+    void * pickled, int pickledLen,
+    const void * key, int keyLen);
+
+bool
+MatrixOlmAccountGetDeviceKey(
+    MatrixOlmAccount * account,
+    char * key, int keyCap);
+    
+bool
+MatrixOlmAccountGetSigningKey(
+    MatrixOlmAccount * account,
+    char * key, int keyCap);
+
 
 // Matrix Olm Session
 
 typedef struct MatrixOlmSession {
-    const char * deviceId;
+    const char * deviceId; // TODO: char[]
 
     int type;
     OlmSession * session;
     char memory[OLM_SESSION_MEMORY_SIZE];
 } MatrixOlmSession;
 
+bool
+MatrixOlmSessionUnpickle(
+    MatrixOlmSession * session,
+    const char * deviceId,
+    void * pickled, int pickledLen,
+    const void * key, int keyLen);
+
 bool
 MatrixOlmSessionTo(
     MatrixOlmSession * session,
@@ -95,6 +119,13 @@ MatrixOlmSessionEncrypt(
     const char * plaintext,
     char * outBuffer, int outBufferCap);
 
+bool
+MatrixOlmSessionDecrypt(
+    MatrixOlmSession * session,
+    size_t messageType,
+    char * encrypted,
+    char * outBuffer, int outBufferCap);
+
 
 // Matrix Megolm Session
 
@@ -102,6 +133,12 @@ typedef struct MatrixMegolmInSession {
     OlmInboundGroupSession * session;
 } MatrixMegolmInSession;
 
+bool
+MatrixMegolmInSessionDecrypt(
+    MatrixMegolmInSession * megolmInSession,
+    const char * encrypted,
+    char * outDecrypted, int outDecryptedCap);
+
 typedef struct MatrixMegolmOutSession {
     char roomId[ROOM_ID_SIZE];
 
@@ -151,8 +188,8 @@ typedef struct MatrixClient {
     MatrixDevice devices[NUM_DEVICES];
     int numDevices;
     
-    char deviceKey[DEVICE_KEY_SIZE];
-    char signingKey[DEVICE_KEY_SIZE];
+    // char deviceKey[DEVICE_KEY_SIZE];
+    // char signingKey[DEVICE_KEY_SIZE];
 
     char userId[USER_ID_SIZE];
     char server[SERVER_SIZE];
@@ -204,7 +241,7 @@ MatrixClientUploadOnetimeKeys(
     MatrixClient * client);
 
 bool
-MatrixClientUploadDeviceKeys(
+MatrixClientUploadDeviceKey(
     MatrixClient * client);
 
 bool
@@ -238,7 +275,15 @@ MatrixClientSendEventEncrypted(
 bool
 MatrixClientSync(
     MatrixClient * client,
-    char * outSync, int outSyncCap);
+    char * outSync, int outSyncCap,
+    const char * nextBatch);
+
+bool
+MatrixClientGetRoomEvent(
+    MatrixClient * client,
+    const char * roomId,
+    const char * eventId,
+    char * outEvent, int outEventCap);
 
 bool
 MatrixClientShareMegolmOutSession(
@@ -250,6 +295,7 @@ MatrixClientShareMegolmOutSession(
 bool
 MatrixClientShareMegolmOutSessionTest(
     MatrixClient * client,
+    const char * userId,
     const char * deviceId,
     MatrixMegolmOutSession * session);
 
@@ -269,6 +315,16 @@ bool
 MatrixClientInitMegolmOutSession(
     MatrixClient * client,
     const char * roomId);
+    
+bool
+MatrixClientRequestMegolmInSession(
+    MatrixClient * client,
+    const char * roomId,
+    const char * sessionId,
+    const char * senderKey,
+    const char * userId,
+    const char * deviceId, // TODO: remove deviceId (query all devices)
+    MatrixMegolmInSession * outMegolmInSession);
 
 bool
 MatrixClientGetOlmSession(
@@ -294,21 +350,31 @@ MatrixClientSendToDeviceEncrypted(
     const char * msgType);
 
 bool
-MatrixClientGetDeviceKey(
+MatrixClientSendDummy(
     MatrixClient * client,
-    const char * deviceId,
-    char * outDeviceKey, int outDeviceKeyCap);
+    const char * userId,
+    const char * deviceId);
 
 bool
-MatrixClientGetDeviceKey(
+MatrixClientRequestDeviceKey(
     MatrixClient * client,
     const char * deviceId,
     char * outDeviceKey, int outDeviceKeyCap);
+    
+bool
+MatrixClientRequestSigningKey(
+    MatrixClient * client,
+    const char * deviceId,
+    char * outSigningKey, int outSigningKeyCap);
 
 bool
 MatrixClientRequestDeviceKeys(
     MatrixClient * client);
 
+bool
+MatrixClientDeleteDevice(
+    MatrixClient * client);
+
 
 
 
@@ -357,7 +423,8 @@ JsonEscape(
     const char * sIn, int sInLen,
     char * sOut, int sOutCap);
     
-bool JsonSign(
+bool
+JsonSign(
     MatrixClient * client,
     const char * sIn, int sInLen,
     char * sOut, int sOutCap);