able to send encrypted messages :)

[matrix_esp_thesis] / src / matrix.c

diff --git a/src/matrix.c b/src/matrix.c
index fbcf97e7d1dc46e3cd224ac40347ef67472ff420..06409b82ea3f3029d07c8f28dc267b98c900c0bb 100644 (file)
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -23,8 +23,8 @@
 #define KEYS_QUERY_RESPONSE_SIZE (1024*10)\r
 \r
 #define KEYS_UPLOAD_URL "/_matrix/client/v3/keys/upload"\r
 #define KEYS_QUERY_RESPONSE_SIZE (1024*10)\r
 \r
 #define KEYS_UPLOAD_URL "/_matrix/client/v3/keys/upload"\r

-#define KEYS_UPLOAD_REQUEST_SIZE 1024\r
-#define KEYS_UPLOAD_REQUEST_SIGNED_SIZE 2048\r
+#define KEYS_UPLOAD_REQUEST_SIZE 1024*4\r
+#define KEYS_UPLOAD_REQUEST_SIGNED_SIZE 2048*4\r

 #define KEYS_UPLOAD_RESPONSE_SIZE 2048\r
 \r
 #define KEYS_CLAIM_URL "/_matrix/client/v3/keys/claim"\r
 #define KEYS_UPLOAD_RESPONSE_SIZE 2048\r
 \r
 #define KEYS_CLAIM_URL "/_matrix/client/v3/keys/claim"\r


@@ -88,6 +88,9 @@ bool JsonSign(
             signature, OLM_SIGNATURE_SIZE);\r
     \r
     int signatureLen = res;\r
             signature, OLM_SIGNATURE_SIZE);\r
     \r
     int signatureLen = res;\r

+    \r
+    char thisSigningKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r

 \r
     static char signatureJson[JSON_SIGNATURE_SIZE];\r
     int signatureJsonLen =\r
 \r
     static char signatureJson[JSON_SIGNATURE_SIZE];\r
     int signatureJsonLen =\r


@@ -100,7 +103,7 @@ bool JsonSign(
                 "}"\r
             "}",\r
             client->userId,\r
                 "}"\r
             "}",\r
             client->userId,\r

-            client->deviceId,\r
+            "1",\r

             signatureLen, signature);\r
 \r
     struct mjson_fixedbuf result = { sOut, sOutCap, 0 };\r
             signatureLen, signature);\r
 \r
     struct mjson_fixedbuf result = { sOut, sOutCap, 0 };\r


@@ -131,7 +134,54 @@ MatrixOlmAccountInit(
     return res != olm_error();\r
 }\r
 \r
     return res != olm_error();\r
 }\r
 \r

-// TODO: in/outbound sessions\r
+bool\r
+MatrixOlmAccountUnpickle(\r
+    MatrixOlmAccount * account,\r
+    void * pickled, int pickledLen,\r
+    const void * key, int keyLen)\r
+{\r
+    size_t res;\r
+    res = olm_unpickle_account(account->account,\r
+        key, keyLen,\r
+        pickled, pickledLen);\r
+    if (res == olm_error()) {\r
+        printf("error unpickling olm account:%s\n",\r
+            olm_account_last_error(account->account));\r
+    }\r
+    return res != olm_error();\r
+}\r
+\r
+bool\r
+MatrixOlmAccountGetDeviceKey(\r
+    MatrixOlmAccount * account,\r
+    char * key, int keyCap)\r
+{\r
+    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
+    size_t res =\r
+        olm_account_identity_keys(account->account,\r
+            deviceKeysJson, OLM_IDENTITY_KEYS_JSON_SIZE);\r
+    mjson_get_string(deviceKeysJson, res,\r
+        "$.curve25519",\r
+        key, keyCap);\r
+    return true;\r
+}\r
+\r
+bool\r
+MatrixOlmAccountGetSigningKey(\r
+    MatrixOlmAccount * account,\r
+    char * key, int keyCap)\r
+{\r
+    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
+    size_t res =\r
+        olm_account_identity_keys(account->account,\r
+            deviceKeysJson, OLM_IDENTITY_KEYS_JSON_SIZE);\r
+    mjson_get_string(deviceKeysJson, res,\r
+        "$.ed25519",\r
+        key, keyCap);\r
+    return true;\r
+}\r
+\r
+// TODO:in/outbound sessions\r

 bool\r
 MatrixOlmSessionTo(\r
     MatrixOlmSession * session,\r
 bool\r
 MatrixOlmSessionTo(\r
     MatrixOlmSession * session,\r


@@ -158,12 +208,38 @@ MatrixOlmSessionTo(
             random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);\r
     \r
     if (res == olm_error()) {\r
             random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);\r
     \r
     if (res == olm_error()) {\r

-        printf("error olm: %s\n", olm_account_last_error(olmAccount));\r
+        printf("error olm:%s\n", olm_session_last_error(session->session));\r

     }\r
 \r
     return session->session != NULL;\r
 }\r
 \r
     }\r
 \r
     return session->session != NULL;\r
 }\r
 \r

+bool\r
+MatrixOlmSessionUnpickle(\r
+    MatrixOlmSession * session,\r
+    const char * deviceId,\r
+    void * pickled, int pickledLen,\r
+    const void * key, int keyLen)\r
+{\r
+    memset(session, 0, sizeof(MatrixOlmSession));\r
+\r
+    session->deviceId = deviceId;\r
+\r
+    session->session =\r
+        olm_session(session->memory);\r
+    \r
+    size_t res;\r
+    res = olm_unpickle_session(session->session,\r
+        key, keyLen,\r
+        pickled, pickledLen);\r
+    \r
+    if (res == olm_error()) {\r
+        printf("error unpickling olm session:%s\n", olm_session_last_error(session->session));\r
+    }\r
+\r
+    return res != olm_error();\r
+}\r
+\r

 bool\r
 MatrixOlmSessionEncrypt(\r
     MatrixOlmSession * session,\r
 bool\r
 MatrixOlmSessionEncrypt(\r
     MatrixOlmSession * session,\r


@@ -192,7 +268,7 @@ MatrixMegolmOutSessionInit(
     static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];\r
     Randomize(random, MEGOLM_INIT_RANDOM_SIZE);\r
 \r
     static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];\r
     Randomize(random, MEGOLM_INIT_RANDOM_SIZE);\r
 \r

-    session->roomId = roomId;\r
+    strncpy(session->roomId, roomId, ROOM_ID_SIZE);\r

 \r
     session->session =\r
         olm_outbound_group_session(session->memory);\r
 \r
     session->session =\r
         olm_outbound_group_session(session->memory);\r


@@ -226,6 +302,72 @@ MatrixMegolmOutSessionEncrypt(
     return res != olm_error();\r
 }\r
 \r
     return res != olm_error();\r
 }\r
 \r

+bool\r
+MatrixMegolmOutSessionSave(\r
+    MatrixMegolmOutSession * session,\r
+    const char * filename,\r
+    const char * key)\r
+{\r
+    FILE * f = fopen(filename, "w");\r
+\r
+    size_t roomIdLen = strlen(session->roomId);\r
+    fwrite(&roomIdLen, sizeof(size_t), 1, f);\r
+    fwrite(session->roomId, 1, roomIdLen, f);\r
+\r
+    size_t pickleBufferLen =\r
+        olm_pickle_outbound_group_session_length(\r
+            session->session);\r
+    void * pickleBuffer = malloc(pickleBufferLen);\r
+\r
+    olm_pickle_outbound_group_session(\r
+        session->session,\r
+        key, strlen(key),\r
+        pickleBuffer, pickleBufferLen);\r
+    \r
+    fwrite(&pickleBufferLen, sizeof(size_t), 1, f);\r
+    fwrite(pickleBuffer, 1, pickleBufferLen, f);\r
+    free(pickleBuffer);\r
+\r
+    fclose(f);\r
+\r
+    return true;\r
+}\r
+\r
+bool\r
+MatrixMegolmOutSessionLoad(\r
+    MatrixMegolmOutSession * session,\r
+    const char * filename,\r
+    const char * key)\r
+{\r
+    FILE * f = fopen(filename, "r");\r
+\r
+    size_t roomIdLen;\r
+    fread(&roomIdLen, sizeof(size_t), 1, f);\r
+    fread(session->roomId, 1, roomIdLen, f);\r
+    for (int i = roomIdLen; i < ROOM_ID_SIZE; i++)\r
+        session->roomId[i] = '\0';\r
+\r
+    size_t pickleBufferLen;\r
+    fread(&pickleBufferLen, sizeof(size_t), 1, f);\r
+\r
+    void * pickleBuffer = malloc(pickleBufferLen);\r
+    fread(pickleBuffer, 1, pickleBufferLen, f);\r
+\r
+    olm_unpickle_outbound_group_session(\r
+        session->session,\r
+        key, strlen(key),\r
+        pickleBuffer, pickleBufferLen);\r
+    \r
+    free(pickleBuffer);\r
+\r
+    olm_outbound_group_session_id(session->session, (uint8_t *)session->id, MEGOLM_SESSION_ID_SIZE);\r
+    olm_outbound_group_session_key(session->session, (uint8_t *)session->key, MEGOLM_SESSION_KEY_SIZE);\r
+\r
+    fclose(f);\r
+\r
+    return true;\r
+}\r
+\r

 \r
 \r
 bool\r
 \r
 \r
 bool\r


@@ -240,36 +382,83 @@ MatrixClientInit(
     // init olm account\r
     MatrixOlmAccountInit(&client->olmAccount);\r
 \r
     // init olm account\r
     MatrixOlmAccountInit(&client->olmAccount);\r
 \r

-    // set device key\r
-    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
-    size_t res =\r
-        olm_account_identity_keys(\r
-            client->olmAccount.account,\r
-            deviceKeysJson,\r
-            OLM_IDENTITY_KEYS_JSON_SIZE);\r
+    return true;\r
+}\r

 \r
 \r

-    mjson_get_string(deviceKeysJson, res,\r
-        "$.curve25519",\r
-        client->deviceKey, DEVICE_KEY_SIZE);\r
-    mjson_get_string(deviceKeysJson, res,\r
-        "$.ed25519",\r
-        client->signingKey, SIGNING_KEY_SIZE);\r
+bool\r
+MatrixClientSave(\r
+    MatrixClient * client,\r
+    const char * filename)\r
+{\r
+    FILE * f = fopen(filename, "w");\r
+    \r
+    \r
+    char thisDeviceKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+    char thisSigningKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
+\r
+\r
+    fwrite(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);\r
+    fwrite(thisSigningKey, 1, DEVICE_KEY_SIZE, f);\r
+    fwrite(client->userId, 1, USER_ID_SIZE, f);\r
+    fwrite(client->server, 1, SERVER_SIZE, f);\r
+    fwrite(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);\r
+    fwrite(client->deviceId, 1, DEVICE_ID_SIZE, f);\r
+    fwrite(client->expireMs, 1, EXPIRE_MS_SIZE, f);\r
+    fwrite(client->refreshToken, 1, REFRESH_TOKEN_SIZE, f);\r
+\r
+    fwrite(&client->numDevices, sizeof(int), 1, f);\r
+    for (int i = 0; i < client->numDevices; i++) {\r
+        fwrite(client->devices[i].deviceId, 1, DEVICE_ID_SIZE, f);\r
+        fwrite(client->devices[i].deviceKey, 1, DEVICE_KEY_SIZE, f);\r
+    }\r

 \r
 \r

+    fclose(f);\r

     return true;\r
 }\r
 \r
 bool\r
     return true;\r
 }\r
 \r
 bool\r

-MatrixClientSetAccessToken(\r
+MatrixClientLoad(\r

     MatrixClient * client,\r
     MatrixClient * client,\r

-    const char * accessToken)\r
+    const char * filename)\r

 {\r
 {\r

-    int accessTokenLen = strlen(accessToken);\r
+    FILE * f = fopen(filename, "r");\r
+    \r
+    \r
+    char thisDeviceKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+    char thisSigningKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
+\r
+\r
+    fread(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);\r
+    fread(thisSigningKey, 1, DEVICE_KEY_SIZE, f);\r
+    fread(client->userId, 1, USER_ID_SIZE, f);\r
+    fread(client->server, 1, SERVER_SIZE, f);\r
+    fread(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);\r
+    fread(client->deviceId, 1, DEVICE_ID_SIZE, f);\r
+    fread(client->expireMs, 1, EXPIRE_MS_SIZE, f);\r
+    fread(client->refreshToken, 1, REFRESH_TOKEN_SIZE, f);\r
+\r
+    fread(&client->numDevices, sizeof(int), 1, f);\r
+    for (int i = 0; i < client->numDevices; i++) {\r
+        fread(client->devices[i].deviceId, 1, DEVICE_ID_SIZE, f);\r
+        fread(client->devices[i].deviceKey, 1, DEVICE_KEY_SIZE, f);\r
+    }\r

 \r
 \r

-    if (accessTokenLen > ACCESS_TOKEN_SIZE - 1)\r
-        return false;\r
+    fclose(f);\r
+    return true;\r
+}\r

 \r
 \r

-    for (int i = 0; i < accessTokenLen; i++)\r
+bool\r
+MatrixClientSetAccessToken(\r
+    MatrixClient * client,\r
+    const char * accessToken)\r
+{\r
+    for (int i = 0; i < ACCESS_TOKEN_SIZE-1; i++)\r

         client->accessToken[i] = accessToken[i];\r
         client->accessToken[i] = accessToken[i];\r

+    client->accessToken[ACCESS_TOKEN_SIZE-1] = '\0';\r

 \r
     return true;\r
 }\r
 \r
     return true;\r
 }\r


@@ -279,13 +468,9 @@ MatrixClientSetDeviceId(
     MatrixClient * client,\r
     const char * deviceId)\r
 {\r
     MatrixClient * client,\r
     const char * deviceId)\r
 {\r

-    int deviceIdLen = strlen(deviceId);\r
-\r
-    if (deviceIdLen > DEVICE_ID_SIZE - 1)\r
-        return false;\r
-\r
-    for (int i = 0; i < deviceIdLen; i++)\r
+    for (int i = 0; i < DEVICE_ID_SIZE-1; i++)\r

         client->deviceId[i] = deviceId[i];\r
         client->deviceId[i] = deviceId[i];\r

+    client->deviceId[DEVICE_ID_SIZE-1] = '\0';\r

 \r
     return true;\r
 }\r
 \r
     return true;\r
 }\r


@@ -295,13 +480,9 @@ MatrixClientSetUserId(
     MatrixClient * client,\r
     const char * userId)\r
 {\r
     MatrixClient * client,\r
     const char * userId)\r
 {\r

-    int userIdLen = strlen(userId);\r
-\r
-    if (userIdLen > USER_ID_SIZE - 1)\r
-        return false;\r
-\r
-    for (int i = 0; i < userIdLen; i++)\r
+    for (int i = 0; i < USER_ID_SIZE-1; i++)\r

         client->userId[i] = userId[i];\r
         client->userId[i] = userId[i];\r

+    client->userId[USER_ID_SIZE-1] = '\0';\r

 \r
     return true;\r
 }\r
 \r
     return true;\r
 }\r


@@ -374,9 +555,14 @@ MatrixClientUploadOnetimeKeys(
 \r
 // https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload\r
 bool\r
 \r
 // https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload\r
 bool\r

-MatrixClientUploadDeviceKeys(\r
+MatrixClientUploadDeviceKey(\r

     MatrixClient * client)\r
 {\r
     MatrixClient * client)\r
 {\r

+    char thisDeviceKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+    char thisSigningKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
+\r

     static char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 \r
     mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
     static char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
 \r
     mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r


@@ -390,8 +576,8 @@ MatrixClientUploadDeviceKeys(
             "\"user_id\":\"%s\""\r
         "}}",\r
         client->deviceId,\r
             "\"user_id\":\"%s\""\r
         "}}",\r
         client->deviceId,\r

-        client->deviceId, client->deviceKey,\r
-        client->deviceId, client->signingKey,\r
+        client->deviceId, thisDeviceKey,\r
+        client->deviceId, thisSigningKey,\r

         client->userId);\r
 \r
     static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
         client->userId);\r
 \r
     static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r


@@ -421,12 +607,12 @@ MatrixClientClaimOnetimeKey(
     static char requestBuffer[KEYS_CLAIM_REQUEST_SIZE];\r
     mjson_snprintf(requestBuffer, KEYS_CLAIM_REQUEST_SIZE,\r
     "{"\r
     static char requestBuffer[KEYS_CLAIM_REQUEST_SIZE];\r
     mjson_snprintf(requestBuffer, KEYS_CLAIM_REQUEST_SIZE,\r
     "{"\r

-      "\"one_time_keys\": {"\r
-        "\"%s\": {"\r
-          "\"%s\": \"signed_curve25519\""\r
+      "\"one_time_keys\":{"\r
+        "\"%s\":{"\r
+          "\"%s\":\"signed_curve25519\""\r

         "}"\r
       "},"\r
         "}"\r
       "},"\r

-      "\"timeout\": 10000"\r
+      "\"timeout\":10000"\r

     "}",\r
     userId,\r
     deviceId);\r
     "}",\r
     userId,\r
     deviceId);\r


@@ -461,7 +647,7 @@ MatrixClientClaimOnetimeKey(
     mjson_get_string(keyObject + voff, vlen,\r
         "$.key", outOnetimeKey, outOnetimeKeyCap);\r
     \r
     mjson_get_string(keyObject + voff, vlen,\r
         "$.key", outOnetimeKey, outOnetimeKeyCap);\r
     \r

-    // TODO: verify signature\r
+    // TODO:verify signature\r

     \r
     return true;\r
 }\r
     \r
     return true;\r
 }\r


@@ -478,13 +664,13 @@ MatrixClientLoginPassword(
 \r
     mjson_snprintf(requestBuffer, LOGIN_REQUEST_SIZE,\r
         "{"\r
 \r
     mjson_snprintf(requestBuffer, LOGIN_REQUEST_SIZE,\r
         "{"\r

-            "\"type\": \"m.login.password\","\r
-            "\"identifier\": {"\r
-                "\"type\": \"m.id.user\","\r
-                "\"user\": \"%s\""\r
+            "\"type\":\"m.login.password\","\r
+            "\"identifier\":{"\r
+                "\"type\":\"m.id.user\","\r
+                "\"user\":\"%s\""\r

             "},"\r
             "},"\r

-            "\"password\": \"%s\","\r
-            "\"initial_device_display_name\": \"%s\""\r
+            "\"password\":\"%s\","\r
+            "\"initial_device_display_name\":\"%s\""\r

         "}",\r
         username,\r
         password,\r
         "}",\r
         username,\r
         password,\r


@@ -498,10 +684,10 @@ MatrixClientLoginPassword(
             responseBuffer, LOGIN_RESPONSE_SIZE,\r
             false);\r
     \r
             responseBuffer, LOGIN_RESPONSE_SIZE,\r
             false);\r
     \r

-    int responseLen = strlen(responseBuffer);\r
-    \r

     if (!result)\r
         return false;\r
     if (!result)\r
         return false;\r

+    \r
+    int responseLen = strlen(responseBuffer);\r

 \r
     mjson_get_string(responseBuffer, responseLen,\r
         "$.access_token",\r
 \r
     mjson_get_string(responseBuffer, responseLen,\r
         "$.access_token",\r


@@ -573,8 +759,12 @@ MatrixClientSendEventEncrypted(
         requestBuffer,\r
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
 \r
         requestBuffer,\r
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
 \r

+    char thisDeviceKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+    \r
+\r

     // encrypted event json\r
     // encrypted event json\r

-    const char * senderKey = client->deviceKey;\r
+    const char * senderKey = thisDeviceKey;\r

     const char * sessionId = outSession->id;\r
     const char * deviceId = client->deviceId;\r
 \r
     const char * sessionId = outSession->id;\r
     const char * deviceId = client->deviceId;\r
 \r


@@ -656,6 +846,7 @@ MatrixClientShareMegolmOutSession(
 bool\r
 MatrixClientShareMegolmOutSessionTest(\r
     MatrixClient * client,\r
 bool\r
 MatrixClientShareMegolmOutSessionTest(\r
     MatrixClient * client,\r

+    const char * userId,\r

     const char * deviceId,\r
     MatrixMegolmOutSession * session)\r
 {\r
     const char * deviceId,\r
     MatrixMegolmOutSession * session)\r
 {\r


@@ -675,7 +866,7 @@ MatrixClientShareMegolmOutSessionTest(
 \r
     // send\r
     MatrixClientSendToDevice(client,\r
 \r
     // send\r
     MatrixClientSendToDevice(client,\r

-        client->userId,\r
+        userId,\r

         deviceId,\r
         eventBuffer,\r
         "m.room_key");\r
         deviceId,\r
         eventBuffer,\r
         "m.room_key");\r


@@ -715,19 +906,29 @@ MatrixClientGetMegolmOutSession(
         }\r
     }\r
 \r
         }\r
     }\r
 \r

+    if (MatrixClientInitMegolmOutSession(client, roomId)) {\r
+        *outSession = &client->megolmOutSessions[client->numMegolmOutSessions-1];\r
+        return true;\r
+    }\r
+\r
+    return false;\r
+}\r
+\r
+bool\r
+MatrixClientInitMegolmOutSession(\r
+    MatrixClient * client,\r
+    const char * roomId)\r
+{\r

     if (client->numMegolmOutSessions < NUM_MEGOLM_SESSIONS)\r
     {\r
         MatrixMegolmOutSessionInit(\r
             &client->megolmOutSessions[client->numMegolmOutSessions],\r
             roomId);\r
     if (client->numMegolmOutSessions < NUM_MEGOLM_SESSIONS)\r
     {\r
         MatrixMegolmOutSessionInit(\r
             &client->megolmOutSessions[client->numMegolmOutSessions],\r
             roomId);\r

-\r
-        *outSession = &client->megolmOutSessions[client->numMegolmOutSessions];\r

         \r
         client->numMegolmOutSessions++;\r
 \r
         return true;\r
     }\r
         \r
         client->numMegolmOutSessions++;\r
 \r
         return true;\r
     }\r

-\r

     return false;\r
 }\r
 \r
     return false;\r
 }\r
 \r


@@ -750,7 +951,7 @@ MatrixClientGetOlmSession(
     if (client->numOlmSessions < NUM_OLM_SESSIONS)\r
     {\r
         static char deviceKey[DEVICE_KEY_SIZE];\r
     if (client->numOlmSessions < NUM_OLM_SESSIONS)\r
     {\r
         static char deviceKey[DEVICE_KEY_SIZE];\r

-        MatrixClientGetDeviceKey(client,\r
+        MatrixClientRequestDeviceKey(client,\r

             deviceId,\r
             deviceKey, DEVICE_KEY_SIZE);\r
 \r
             deviceId,\r
             deviceKey, DEVICE_KEY_SIZE);\r
 \r


@@ -793,8 +994,8 @@ MatrixClientSendToDevice(
     static char eventBuffer[TODEVICE_EVENT_SIZE];\r
     snprintf(eventBuffer, TODEVICE_EVENT_SIZE,\r
         "{"\r
     static char eventBuffer[TODEVICE_EVENT_SIZE];\r
     snprintf(eventBuffer, TODEVICE_EVENT_SIZE,\r
         "{"\r

-            "\"messages\": {"\r
-                "\"%s\": {"\r
+            "\"messages\":{"\r
+                "\"%s\":{"\r

                     "\"%s\":%s"\r
                 "}"\r
             "}"\r
                     "\"%s\":%s"\r
                 "}"\r
             "}"\r


@@ -827,29 +1028,36 @@ MatrixClientSendToDeviceEncrypted(
     MatrixClientGetOlmSession(client, userId, deviceId, &olmSession);\r
 \r
     // create event json\r
     MatrixClientGetOlmSession(client, userId, deviceId, &olmSession);\r
 \r
     // create event json\r

-    char deviceKey[DEVICE_KEY_SIZE];\r
-    MatrixClientGetDeviceKey(client, deviceId, deviceKey, DEVICE_KEY_SIZE);\r
+    char targetDeviceKey[DEVICE_KEY_SIZE];\r
+    MatrixClientRequestDeviceKey(client, deviceId, targetDeviceKey, DEVICE_KEY_SIZE);\r
+    char targetSigningKey[SIGNING_KEY_SIZE];\r
+    MatrixClientRequestSigningKey(client, deviceId, targetSigningKey, SIGNING_KEY_SIZE);\r

     \r
     \r

+    char thisSigningKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
+\r

     static char eventBuffer[TODEVICE_EVENT_SIZE];\r
     sprintf(eventBuffer,\r
         "{"\r
     static char eventBuffer[TODEVICE_EVENT_SIZE];\r
     sprintf(eventBuffer,\r
         "{"\r

-        "\"type\": \"%s\","\r
-        "\"content\": \"%s\","\r
-        "\"sender\": \"%s\","\r
-        "\"recipient\": \"%s\","\r
-        "\"recipient_keys\": {"\r
-          "\"ed25519\": \"%s\""\r
+        "\"type\":\"%s\","\r
+        "\"content\":%s,"\r
+        "\"sender\":\"%s\","\r
+        "\"recipient\":\"%s\","\r
+        "\"recipient_keys\":{"\r
+          "\"ed25519\":\"%s\""\r

         "},"\r
         "},"\r

-        "\"keys\": {"\r
-          "\"ed25519\": \"%s\""\r
+        "\"keys\":{"\r
+          "\"ed25519\":\"%s\""\r

         "}"\r
         "}",\r
         msgType,\r
         message,\r
         client->userId,\r
         userId, // recipient user id\r
         "}"\r
         "}",\r
         msgType,\r
         message,\r
         client->userId,\r
         userId, // recipient user id\r

-        deviceKey, // recipient device key\r
-        client->deviceKey);\r
+        targetSigningKey, // recipient device key\r
+        thisSigningKey);\r
+    \r
+    printf("%s\n", eventBuffer);\r

 \r
     // encrypt\r
     static char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];\r
 \r
     // encrypt\r
     static char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];\r


@@ -857,6 +1065,10 @@ MatrixClientSendToDeviceEncrypted(
         eventBuffer,\r
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
 \r
         eventBuffer,\r
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);\r
 \r

+    char thisDeviceKey[DEVICE_KEY_SIZE];\r
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+\r
+\r

     static char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
     sprintf(encryptedEventBuffer,\r
         "{"\r
     static char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];\r
     sprintf(encryptedEventBuffer,\r
         "{"\r


@@ -870,11 +1082,11 @@ MatrixClientSendToDeviceEncrypted(
         "\"device_id\":\"%s\","\r
         "\"sender_key\":\"%s\""\r
         "}",\r
         "\"device_id\":\"%s\","\r
         "\"sender_key\":\"%s\""\r
         "}",\r

-        deviceKey,\r
+        targetDeviceKey,\r

         encryptedBuffer,\r
         encryptedBuffer,\r

-        0, //olmSession->type,\r
+        olm_session_has_received_message(olmSession->session),\r

         client->deviceId,\r
         client->deviceId,\r

-        client->deviceKey);\r
+        thisDeviceKey);\r

 \r
     // send\r
     return MatrixClientSendToDevice(\r
 \r
     // send\r
     return MatrixClientSendToDevice(\r


@@ -907,7 +1119,7 @@ MatrixClientFindDevice(
 }\r
 \r
 bool\r
 }\r
 \r
 bool\r

-MatrixClientGetDeviceKey(\r
+MatrixClientRequestDeviceKey(\r

     MatrixClient * client,\r
     const char * deviceId,\r
     char * outDeviceKey, int outDeviceKeyCap)\r
     MatrixClient * client,\r
     const char * deviceId,\r
     char * outDeviceKey, int outDeviceKeyCap)\r


@@ -931,6 +1143,31 @@ MatrixClientGetDeviceKey(
     return false;\r
 }\r
 \r
     return false;\r
 }\r
 \r

+bool\r
+MatrixClientRequestSigningKey(\r
+    MatrixClient * client,\r
+    const char * deviceId,\r
+    char * outSigningKey, int outSigningKeyCap)\r
+{\r
+    MatrixDevice * device;\r
+    \r
+    if (MatrixClientFindDevice(client, deviceId, &device))\r
+    {\r
+        strncpy(outSigningKey, device->signingKey, outSigningKeyCap);\r
+        return true;\r
+    }\r
+\r
+    MatrixClientRequestDeviceKeys(client);\r
+    \r
+    if (MatrixClientFindDevice(client, deviceId, &device))\r
+    {\r
+        strncpy(outSigningKey, device->signingKey, outSigningKeyCap);\r
+        return true;\r
+    }\r
+\r
+    return false;\r
+}\r
+\r

 // https://spec.matrix.org/v1.6/client-server-api/#post_matrixclientv3keysquery\r
 bool\r
 MatrixClientRequestDeviceKeys(\r
 // https://spec.matrix.org/v1.6/client-server-api/#post_matrixclientv3keysquery\r
 bool\r
 MatrixClientRequestDeviceKeys(\r


@@ -963,7 +1200,7 @@ MatrixClientRequestDeviceKeys(
     int slen;\r
     mjson_find(responseBuffer, strlen(responseBuffer),\r
         query, &s, &slen);\r
     int slen;\r
     mjson_find(responseBuffer, strlen(responseBuffer),\r
         query, &s, &slen);\r

-\r
+    \r

     // loop over keys\r
     \r
     int koff, klen, voff, vlen, vtype, off = 0;\r
     // loop over keys\r
     \r
     int koff, klen, voff, vlen, vtype, off = 0;\r


@@ -984,11 +1221,26 @@ MatrixClientRequestDeviceKeys(
         mjson_get_string(val, vlen,\r
             deviceKeyQuery, d.deviceKey, DEVICE_KEY_SIZE);\r
 \r
         mjson_get_string(val, vlen,\r
             deviceKeyQuery, d.deviceKey, DEVICE_KEY_SIZE);\r
 \r

+        // look for signing key in value\r
+        static char signingKeyQuery[JSON_QUERY_SIZE];\r
+        snprintf(signingKeyQuery, JSON_QUERY_SIZE,\r
+            "$.keys.ed25519:%s", d.deviceId);\r
+        mjson_get_string(val, vlen,\r
+            signingKeyQuery, d.signingKey, SIGNING_KEY_SIZE);\r
+\r

         // add device\r
         if (client->numDevices < NUM_DEVICES)\r
         {\r
         // add device\r
         if (client->numDevices < NUM_DEVICES)\r
         {\r

-            client->devices[client->numDevices] = d;\r
-            client->numDevices++;\r
+            bool foundDevice = false;\r
+            for (int i = 0; i < client->numDevices; i++)\r
+                if (strcmp(client->devices[i].deviceId, d.deviceId) == 0)\r
+                    foundDevice = true;\r
+\r
+            if (! foundDevice) {\r
+                printf("new device: %s %s %s\n", d.deviceId, d.deviceKey, d.signingKey);\r
+                client->devices[client->numDevices] = d;\r
+                client->numDevices++;\r
+            }\r

         }\r
         else\r
         {\r
         }\r
         else\r
         {\r


@@ -998,3 +1250,17 @@ MatrixClientRequestDeviceKeys(
 \r
     return true;\r
 }\r
 \r
     return true;\r
 }\r

+\r
+bool\r
+MatrixClientDeleteDevice(\r
+    MatrixClient * client)\r
+{\r
+    static char deleteRequest[1024];\r
+    snprintf(deleteRequest, 1024,\r
+        "{\"devices\":[\"%s\"]}",\r
+        client->deviceId);\r
+    static char deleteResponse[1024];\r
+    bool res = MatrixHttpPost(client, "/_matrix/client/v3/delete_devices",\r
+        deleteRequest, deleteResponse, 1024, true);\r
+    return res;\r
+}
\ No newline at end of file