more changes towards sharing megolm sessions

[matrix_esp_thesis] / src / matrix.h

diff --git a/src/matrix.h b/src/matrix.h
index 60561aa04087d4c0c81d5881a9a235e216120e18..a06eab9e0edb7c0a510819f3bf4f101ab5019caf 100644 (file)
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -21,20 +21,31 @@
 #define OLM_IDENTITY_KEYS_JSON_SIZE 128\r
 #define DEVICE_KEY_SIZE 44\r
 #define SIGNING_KEY_SIZE 44\r
 #define OLM_IDENTITY_KEYS_JSON_SIZE 128\r
 #define DEVICE_KEY_SIZE 44\r
 #define SIGNING_KEY_SIZE 44\r

+#define ONETIME_KEY_SIZE 44\r

 \r
 #define KEY_SHARE_EVENT_LEN 1024\r
 \r
 #define OLM_ACCOUNT_MEMORY_SIZE 7528\r
 \r
 #define KEY_SHARE_EVENT_LEN 1024\r
 \r
 #define OLM_ACCOUNT_MEMORY_SIZE 7528\r

-#define OLM_ACCOUNT_RANDOM_SIZE 32+32\r
+#define OLM_ACCOUNT_RANDOM_SIZE (32+32)\r

 \r
 #define OLM_SESSION_MEMORY_SIZE 3352\r
 #define OLM_ENCRYPT_RANDOM_SIZE 32\r
 \r
 #define OLM_SESSION_MEMORY_SIZE 3352\r
 #define OLM_ENCRYPT_RANDOM_SIZE 32\r

+#define OLM_OUTBOUND_SESSION_RANDOM_SIZE (32*2)\r
+\r
+#define OLM_ONETIME_KEYS_RANDOM_SIZE (32*10)\r
+#define OLM_KEY_ID_SIZE 32\r
+\r
+#define OLM_SIGNATURE_SIZE 128\r

 \r
 #define MEGOLM_OUTBOUND_SESSION_MEMORY_SIZE 232\r
 #define MEGOLM_SESSION_ID_SIZE 44\r
 #define MEGOLM_SESSION_KEY_SIZE 306\r
 #define MEGOLM_INIT_RANDOM_SIZE (4*32 + 32)\r
 \r
 \r
 #define MEGOLM_OUTBOUND_SESSION_MEMORY_SIZE 232\r
 #define MEGOLM_SESSION_ID_SIZE 44\r
 #define MEGOLM_SESSION_KEY_SIZE 306\r
 #define MEGOLM_INIT_RANDOM_SIZE (4*32 + 32)\r
 \r

+#define JSON_ONETIME_KEY_SIZE 128\r
+#define JSON_ONETIME_KEY_SIGNED_SIZE 256\r
+#define JSON_SIGNATURE_SIZE 256\r
+\r

 #define NUM_MEGOLM_SESSIONS 10\r
 #define NUM_OLM_SESSIONS 10\r
 #define NUM_DEVICES 10\r
 #define NUM_MEGOLM_SESSIONS 10\r
 #define NUM_OLM_SESSIONS 10\r
 #define NUM_DEVICES 10\r


@@ -44,14 +55,35 @@ Randomize(uint8_t * random, int randomLen);
 \r
 bool\r
 JsonEscape(\r
 \r
 bool\r
 JsonEscape(\r

-    char * sIn, int sInLen,\r
+    const char * sIn, int sInLen,\r

     char * sOut, int sOutCap);\r
     char * sOut, int sOutCap);\r

+    \r
+bool JsonSign(\r
+    const char * sIn, int sInLen,\r
+    char * sOut, int sOutCap);\r
+\r
+// Matrix Device\r

 \r
 typedef struct MatrixDevice {\r
     char deviceId[DEVICE_ID_SIZE];\r
     char deviceKey[DEVICE_KEY_SIZE];\r
 } MatrixDevice;\r
 \r
 \r
 typedef struct MatrixDevice {\r
     char deviceId[DEVICE_ID_SIZE];\r
     char deviceKey[DEVICE_KEY_SIZE];\r
 } MatrixDevice;\r
 \r

+\r
+// Matrix Olm Account\r
+\r
+typedef struct MatrixOlmAccount {\r
+    OlmAccount * account;\r
+    char memory[OLM_ACCOUNT_MEMORY_SIZE];\r
+} MatrixOlmAccount;\r
+\r
+bool\r
+MatrixOlmAccountInit(\r
+    MatrixOlmAccount * account);\r
+\r
+\r
+// Matrix Olm Session\r
+\r

 typedef struct MatrixOlmSession {\r
     const char * deviceId;\r
 \r
 typedef struct MatrixOlmSession {\r
     const char * deviceId;\r
 \r


@@ -61,9 +93,12 @@ typedef struct MatrixOlmSession {
 } MatrixOlmSession;\r
 \r
 bool\r
 } MatrixOlmSession;\r
 \r
 bool\r

-MatrixOlmSessionInit(\r
+MatrixOlmSessionTo(\r

     MatrixOlmSession * session,\r
     MatrixOlmSession * session,\r

-    const char * deviceId);\r
+    OlmAccount * olmAccount,\r
+    const char * deviceId,\r
+    const char * deviceKey,\r
+    const char * deviceOnetimeKey);\r

 \r
 bool\r
 MatrixOlmSessionEncrypt(\r
 \r
 bool\r
 MatrixOlmSessionEncrypt(\r


@@ -72,6 +107,7 @@ MatrixOlmSessionEncrypt(
     char * outBuffer, int outBufferCap);\r
 \r
 \r
     char * outBuffer, int outBufferCap);\r
 \r
 \r

+// Matrix Megolm Session\r

 \r
 typedef struct MatrixMegolmInSession {\r
     OlmInboundGroupSession * session;\r
 \r
 typedef struct MatrixMegolmInSession {\r
     OlmInboundGroupSession * session;\r


@@ -99,10 +135,10 @@ MatrixMegolmOutSessionEncrypt(
     char * outBuffer, int outBufferCap);\r
 \r
 \r
     char * outBuffer, int outBufferCap);\r
 \r
 \r

+// Matrix Client\r

 \r
 typedef struct MatrixClient {\r
 \r
 typedef struct MatrixClient {\r

-    OlmAccount * olmAccount;\r
-    char olmAccountMemory[OLM_ACCOUNT_MEMORY_SIZE];\r
+    MatrixOlmAccount olmAccount;\r

 \r
     MatrixMegolmInSession megolmInSessions[NUM_MEGOLM_SESSIONS];\r
     int numMegolmInSessions;\r
 \r
     MatrixMegolmInSession megolmInSessions[NUM_MEGOLM_SESSIONS];\r
     int numMegolmInSessions;\r


@@ -142,6 +178,31 @@ MatrixClientSetDeviceId(
     MatrixClient * client,\r
     const char * deviceId);\r
 \r
     MatrixClient * client,\r
     const char * deviceId);\r
 \r

+bool\r
+MatrixClientSetUserId(\r
+    MatrixClient * client,\r
+    const char * userId);\r
+\r
+bool\r
+MatrixClientGenerateOnetimeKeys(\r
+    MatrixClient * client,\r
+    int numberOfKeys);\r
+\r
+bool\r
+MatrixClientUploadOnetimeKeys(\r
+    MatrixClient * client);\r
+\r
+bool\r
+MatrixClientUploadDeviceKeys(\r
+    MatrixClient * client);\r
+\r
+bool\r
+MatrixClientClaimOnetimeKey(\r
+    MatrixClient * client,\r
+    const char * userId,\r
+    const char * deviceId,\r
+    char * outOnetimeKey, int outOnetimeKeyCap);\r
+\r

 bool\r
 MatrixClientLoginPassword(\r
     MatrixClient * client,\r
 bool\r
 MatrixClientLoginPassword(\r
     MatrixClient * client,\r


@@ -166,10 +227,17 @@ MatrixClientSendEventEncrypted(
 bool\r
 MatrixClientSync(\r
     MatrixClient * client,\r
 bool\r
 MatrixClientSync(\r
     MatrixClient * client,\r

-    char * outSyncBuffer, int outSyncCap);\r
+    char * outSync, int outSyncCap);\r

 \r
 bool\r
 MatrixClientShareMegolmOutSession(\r
 \r
 bool\r
 MatrixClientShareMegolmOutSession(\r

+    MatrixClient * client,\r
+    const char * userId,\r
+    const char * deviceId,\r
+    MatrixMegolmOutSession * session);\r
+\r
+bool\r
+MatrixClientShareMegolmOutSessionTest(\r

     MatrixClient * client,\r
     const char * deviceId,\r
     MatrixMegolmOutSession * session);\r
     MatrixClient * client,\r
     const char * deviceId,\r
     MatrixMegolmOutSession * session);\r


@@ -189,6 +257,7 @@ MatrixClientSetMegolmOutSession(
 bool\r
 MatrixClientGetOlmSession(\r
     MatrixClient * client,\r
 bool\r
 MatrixClientGetOlmSession(\r
     MatrixClient * client,\r

+    const char * userId,\r

     const char * deviceId,\r
     MatrixOlmSession ** outSession);\r
 \r
     const char * deviceId,\r
     MatrixOlmSession ** outSession);\r
 \r


@@ -230,6 +299,10 @@ bool
 MatrixHttpInit(\r
     MatrixClient * client);\r
 \r
 MatrixHttpInit(\r
     MatrixClient * client);\r
 \r

+bool\r
+MatrixHttpConnect(\r
+    MatrixClient * client);\r
+\r

 bool\r
 MatrixHttpDeinit(\r
     MatrixClient * client);\r
 bool\r
 MatrixHttpDeinit(\r
     MatrixClient * client);\r