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

diff --git a/src/matrix.c b/src/matrix.c
index 80802c3..de936de 100644
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -192,7 +192,7 @@ MatrixMegolmOutSessionInit(
     static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];
     Randomize(random, MEGOLM_INIT_RANDOM_SIZE);
 
-    session->roomId = roomId;
+    strncpy(session->roomId, roomId, ROOM_ID_SIZE);
 
     session->session =
         olm_outbound_group_session(session->memory);
@@ -226,6 +226,72 @@ MatrixMegolmOutSessionEncrypt(
     return res != olm_error();
 }
 
+bool
+MatrixMegolmOutSessionSave(
+    MatrixMegolmOutSession * session,
+    const char * filename,
+    const char * key)
+{
+    FILE * f = fopen(filename, "w");
+
+    size_t roomIdLen = strlen(session->roomId);
+    fwrite(&roomIdLen, sizeof(size_t), 1, f);
+    fwrite(session->roomId, 1, roomIdLen, f);
+
+    size_t pickleBufferLen =
+        olm_pickle_outbound_group_session_length(
+            session->session);
+    void * pickleBuffer = malloc(pickleBufferLen);
+
+    olm_pickle_outbound_group_session(
+        session->session,
+        key, strlen(key),
+        pickleBuffer, pickleBufferLen);
+    
+    fwrite(&pickleBufferLen, sizeof(size_t), 1, f);
+    fwrite(pickleBuffer, 1, pickleBufferLen, f);
+    free(pickleBuffer);
+
+    fclose(f);
+
+    return true;
+}
+
+bool
+MatrixMegolmOutSessionLoad(
+    MatrixMegolmOutSession * session,
+    const char * filename,
+    const char * key)
+{
+    FILE * f = fopen(filename, "r");
+
+    size_t roomIdLen;
+    fread(&roomIdLen, sizeof(size_t), 1, f);
+    fread(session->roomId, 1, roomIdLen, f);
+    for (int i = roomIdLen; i < ROOM_ID_SIZE; i++)
+        session->roomId[i] = '\0';
+
+    size_t pickleBufferLen;
+    fread(&pickleBufferLen, sizeof(size_t), 1, f);
+
+    void * pickleBuffer = malloc(pickleBufferLen);
+    fread(pickleBuffer, 1, pickleBufferLen, f);
+
+    olm_unpickle_outbound_group_session(
+        session->session,
+        key, strlen(key),
+        pickleBuffer, pickleBufferLen);
+    
+    free(pickleBuffer);
+
+    olm_outbound_group_session_id(session->session, (uint8_t *)session->id, MEGOLM_SESSION_ID_SIZE);
+    olm_outbound_group_session_key(session->session, (uint8_t *)session->key, MEGOLM_SESSION_KEY_SIZE);
+
+    fclose(f);
+
+    return true;
+}
+
 
 
 bool
@@ -315,14 +381,9 @@ MatrixClientSetAccessToken(
     MatrixClient * client,
     const char * accessToken)
 {
-    int accessTokenLen = strlen(accessToken);
-
-    if (accessTokenLen > ACCESS_TOKEN_SIZE - 1)
-        return false;
-
-    for (int i = 0; i < accessTokenLen; i++)
+    for (int i = 0; i < ACCESS_TOKEN_SIZE-1; i++)
         client->accessToken[i] = accessToken[i];
-    client->accessToken[accessTokenLen] = '\0';
+    client->accessToken[ACCESS_TOKEN_SIZE-1] = '\0';
 
     return true;
 }
@@ -332,14 +393,9 @@ MatrixClientSetDeviceId(
     MatrixClient * client,
     const char * deviceId)
 {
-    int deviceIdLen = strlen(deviceId);
-
-    if (deviceIdLen > DEVICE_ID_SIZE - 1)
-        return false;
-
-    for (int i = 0; i < deviceIdLen; i++)
+    for (int i = 0; i < DEVICE_ID_SIZE-1; i++)
         client->deviceId[i] = deviceId[i];
-    client->deviceId[deviceIdLen] = '\0';
+    client->deviceId[DEVICE_ID_SIZE-1] = '\0';
 
     return true;
 }
@@ -349,14 +405,9 @@ MatrixClientSetUserId(
     MatrixClient * client,
     const char * userId)
 {
-    int userIdLen = strlen(userId);
-
-    if (userIdLen > USER_ID_SIZE - 1)
-        return false;
-
-    for (int i = 0; i < userIdLen; i++)
+    for (int i = 0; i < USER_ID_SIZE-1; i++)
         client->userId[i] = userId[i];
-    client->userId[userIdLen] = '\0';
+    client->userId[USER_ID_SIZE-1] = '\0';
 
     return true;
 }
@@ -770,19 +821,29 @@ MatrixClientGetMegolmOutSession(
         }
     }
 
+    if (MatrixClientInitMegolmOutSession(client, roomId)) {
+        *outSession = &client->megolmOutSessions[client->numMegolmOutSessions-1];
+        return true;
+    }
+
+    return false;
+}
+
+bool
+MatrixClientInitMegolmOutSession(
+    MatrixClient * client,
+    const char * roomId)
+{
     if (client->numMegolmOutSessions < NUM_MEGOLM_SESSIONS)
     {
         MatrixMegolmOutSessionInit(
             &client->megolmOutSessions[client->numMegolmOutSessions],
             roomId);
-
-        *outSession = &client->megolmOutSessions[client->numMegolmOutSessions];
         
         client->numMegolmOutSessions++;
 
         return true;
     }
-
     return false;
 }