X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/9826729ea9eb492b0b25c52b934d9f1283bb70dd..b231872efcb97e52856f5972efd161c6e9b03cd6:/src/matrix.c

diff --git a/src/matrix.c b/src/matrix.c
index 33988b4..40c2e5b 100644
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -9,27 +9,45 @@
 #define LOGIN_RESPONSE_SIZE 1024
 #define LOGIN_URL "/_matrix/client/v3/login"
 
-#define ENCRYPTED_REQUEST_SIZE 512
-#define ENCRYPTED_EVENT_SIZE 1024
-#define ROOMEVENT_REQUEST_SIZE 256
-#define ROOMEVENT_RESPONSE_SIZE 1024
-#define ROOMEVENT_URL "/_matrix/client/v3/rooms/%s/send/%s/%d"
+#define ENCRYPTED_REQUEST_SIZE (1024*5)
+#define ENCRYPTED_EVENT_SIZE (1024*10)
+#define ROOM_SEND_REQUEST_SIZE 256
+#define ROOM_SEND_RESPONSE_SIZE 1024
+#define ROOM_SEND_URL "/_matrix/client/v3/rooms/%s/send/%s/%d"
 
-#define TODEVICE_EVENT_SIZE 512
+#define ROOMKEY_REQUEST_SIZE (1024*4)
+
+#define TODEVICE_EVENT_SIZE (1024*5)
 #define TODEVICE_URL "/_matrix/client/v3/sendToDevice/%s/%d"
 
 #define KEYS_QUERY_URL "/_matrix/client/v3/keys/query"
 #define KEYS_QUERY_REQUEST_SIZE 256
-#define KEYS_QUERY_RESPONSE_SIZE 1024
+#define KEYS_QUERY_RESPONSE_SIZE (1024*10)
 
-#define JSON_QUERY_SIZE 128
+#define KEYS_UPLOAD_URL "/_matrix/client/v3/keys/upload"
+#define KEYS_UPLOAD_REQUEST_SIZE 1024*4
+#define KEYS_UPLOAD_REQUEST_SIGNED_SIZE 2048*4
+#define KEYS_UPLOAD_RESPONSE_SIZE 2048
+
+#define KEYS_CLAIM_URL "/_matrix/client/v3/keys/claim"
+#define KEYS_CLAIM_REQUEST_SIZE 1024
+#define KEYS_CLAIM_RESPONSE_SIZE 1024
 
+#define SYNC_TIMEOUT 5000
+
+#define JSON_QUERY_SIZE 128
+#define JSON_MAX_INDICES 100
+#define JSON_MAX_ENTRY_SIZE 1024
 
+#define MAX(a,b) ((a) > (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 void
-Randomize(uint8_t * random, int randomLen)
+Randomize(
+    uint8_t * random,
+    int randomLen)
 {
-    static bool first = false;
+    static bool first = true;
     if (first) { srand(time(0)); first = false; }
 
     for (int i = 0; i < randomLen; i++)
@@ -40,7 +58,7 @@ Randomize(uint8_t * random, int randomLen)
 
 bool
 JsonEscape(
-    char * sIn, int sInLen,
+    const char * sIn, int sInLen,
     char * sOut, int sOutCap)
 {
     int sOutIndex = 0;
@@ -65,23 +83,260 @@ JsonEscape(
     return true;
 }
 
-// TODO: in/outbound sessions
 bool
-MatrixOlmSessionInit(
+JsonCanonicalize(
+    const char * sIn, int sInLen,
+    char * sOut, int sOutCap)
+{
+    snprintf(sOut, sOutCap, "{}");
+
+    int koff, klen, voff, vlen, vtype, off;
+
+    struct Key {
+        const char * ptr;
+        int len;
+    };
+
+    struct Key keys[JSON_MAX_INDICES];
+    int numKeys = 0;
+
+    for (off = 0; (off = mjson_next(sIn, sInLen, off, &koff, &klen, &voff, &vlen, &vtype)) != 0; ) {
+        keys[numKeys].ptr = sIn + koff;
+        keys[numKeys].len = klen;
+        numKeys++;
+    }
+
+    for (int i = 0; i < numKeys; i++) {
+        for (int j = i; j < numKeys; j++) {
+            if (
+                strncmp(
+                    keys[i].ptr,
+                    keys[j].ptr,
+                    MIN(keys[i].len, keys[j].len)
+                ) > 0
+            ) {
+                struct Key k = keys[i];
+                keys[i] = keys[j];
+                keys[j] = k;
+            }
+        }
+    }
+
+    for (int i = 0; i < numKeys; i++) {
+        char jp[JSON_QUERY_SIZE];
+        snprintf(jp, JSON_QUERY_SIZE, "$.%.*s", keys[i].len-2, keys[i].ptr+1);
+
+        const char * valPtr;
+        int valLen;
+        mjson_find(sIn, sInLen, jp, &valPtr, &valLen);
+        
+        static char newEntry[JSON_MAX_ENTRY_SIZE];
+        snprintf(newEntry, JSON_MAX_ENTRY_SIZE, "{%.*s:%.*s}", keys[i].len, keys[i].ptr, valLen, valPtr);
+
+        char * buffer = strdup(sOut);
+
+        struct mjson_fixedbuf fb = { sOut, sOutCap, 0 };
+        mjson_merge(buffer, strlen(buffer), newEntry, strlen(newEntry), mjson_print_fixed_buf, &fb);
+
+        free(buffer);
+    }
+
+    // TODO: recursively sort entries
+
+    return true;
+}
+
+bool JsonSign(
+    MatrixClient * client,
+    const char * sIn, int sInLen,
+    char * sOut, int sOutCap)
+{
+    static char signature[OLM_SIGNATURE_SIZE];
+    size_t res =
+        olm_account_sign(client->olmAccount.account,
+            sIn, sInLen,
+            signature, OLM_SIGNATURE_SIZE);
+    
+    int signatureLen = res;
+    
+    static char thisSigningKey[SIGNING_KEY_SIZE];
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, SIGNING_KEY_SIZE);
+
+    static char signatureJson[JSON_SIGNATURE_SIZE];
+    int signatureJsonLen =
+        mjson_snprintf(signatureJson, JSON_SIGNATURE_SIZE,
+            "{"
+                "\"signatures\":{"
+                    "\"%s\":{"
+                        "\"ed25519:%s\":\"%.*s\""
+                    "}"
+                "}"
+            "}",
+            client->userId,
+            //"1",
+            client->deviceId,
+            signatureLen, signature);
+
+    struct mjson_fixedbuf result = { sOut, sOutCap, 0 };
+    mjson_merge(
+        sIn, sInLen,
+        signatureJson, signatureJsonLen,
+        mjson_print_fixed_buf,
+        &result);
+
+    return true;
+}
+
+
+bool
+MatrixOlmAccountInit(
+    MatrixOlmAccount * account)
+{
+    account->account = olm_account(account->memory);
+
+    static uint8_t random[OLM_ACCOUNT_RANDOM_SIZE];
+    Randomize(random, OLM_ACCOUNT_RANDOM_SIZE);
+
+    size_t res = olm_create_account(
+        account->account,
+        random,
+        OLM_ACCOUNT_RANDOM_SIZE);
+
+    return res != olm_error();
+}
+
+bool
+MatrixOlmAccountUnpickle(
+    MatrixOlmAccount * account,
+    void * pickled, int pickledLen,
+    const void * key, int keyLen)
+{
+    size_t res;
+    res = olm_unpickle_account(account->account,
+        key, keyLen,
+        pickled, pickledLen);
+    if (res == olm_error()) {
+        printf("error unpickling olm account:%s\n",
+            olm_account_last_error(account->account));
+    }
+    return res != olm_error();
+}
+
+bool
+MatrixOlmAccountGetDeviceKey(
+    MatrixOlmAccount * account,
+    char * key, int keyCap)
+{
+    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];
+    size_t res =
+        olm_account_identity_keys(account->account,
+            deviceKeysJson, OLM_IDENTITY_KEYS_JSON_SIZE);
+    mjson_get_string(deviceKeysJson, res,
+        "$.curve25519",
+        key, keyCap);
+    return true;
+}
+
+bool
+MatrixOlmAccountGetSigningKey(
+    MatrixOlmAccount * account,
+    char * key, int keyCap)
+{
+    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];
+    size_t res =
+        olm_account_identity_keys(account->account,
+            deviceKeysJson, OLM_IDENTITY_KEYS_JSON_SIZE);
+    mjson_get_string(deviceKeysJson, res,
+        "$.ed25519",
+        key, keyCap);
+    return true;
+}
+
+bool
+MatrixOlmSessionFrom(
     MatrixOlmSession * session,
-    const char * deviceId)
+    OlmAccount * olmAccount,
+    const char * deviceId,
+    const char * deviceKey,
+    const char * encrypted)
 {
     memset(session, 0, sizeof(MatrixOlmSession));
 
-    static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];
-    Randomize(random, MEGOLM_INIT_RANDOM_SIZE);
+    session->deviceId = deviceId;
+
+    session->session =
+        olm_session(session->memory);
+    
+    char * encryptedCopy = strdup(encrypted);
+
+    size_t res =
+        olm_create_inbound_session_from(session->session, olmAccount,
+            deviceKey, strlen(deviceKey),
+            encryptedCopy, strlen(encryptedCopy));
+    
+    if (res == olm_error()) {
+        printf("error olm:%s\n", olm_session_last_error(session->session));
+    }
+
+    return res != olm_error();
+}
+
+bool
+MatrixOlmSessionTo(
+    MatrixOlmSession * session,
+    OlmAccount * olmAccount,
+    const char * deviceId,
+    const char * deviceKey,
+    const char * deviceOnetimeKey)
+{
+    memset(session, 0, sizeof(MatrixOlmSession));
+
+    session->deviceId = deviceId;
+
+    session->session =
+        olm_session(session->memory);
+
+    static uint8_t random[OLM_OUTBOUND_SESSION_RANDOM_SIZE];
+    Randomize(random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);
+
+    size_t res =
+        olm_create_outbound_session(session->session,
+            olmAccount,
+            deviceKey, strlen(deviceKey),
+            deviceOnetimeKey, strlen(deviceOnetimeKey),
+            random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);
+    
+    if (res == olm_error()) {
+        printf("error olm:%s\n", olm_session_last_error(session->session));
+    }
+
+    return res != olm_error();
+}
+
+bool
+MatrixOlmSessionUnpickle(
+    MatrixOlmSession * session,
+    const char * deviceId,
+    void * pickled, int pickledLen,
+    const void * key, int keyLen)
+{
+    memset(session, 0, sizeof(MatrixOlmSession));
 
     session->deviceId = deviceId;
 
     session->session =
         olm_session(session->memory);
+    
+    size_t res;
+    res = olm_unpickle_session(session->session,
+        key, keyLen,
+        pickled, pickledLen);
+    
+    if (res == olm_error()) {
+        printf("error unpickling olm session:%s\n", olm_session_last_error(session->session));
+    }
 
-    return session->session != NULL;
+    return res != olm_error();
 }
 
 bool
@@ -101,6 +356,85 @@ MatrixOlmSessionEncrypt(
     return res != olm_error();
 }
 
+bool
+MatrixOlmSessionDecrypt(
+    MatrixOlmSession * session,
+    size_t messageType,
+    char * encrypted,
+    char * outBuffer, int outBufferCap)
+{
+    static uint8_t random[OLM_ENCRYPT_RANDOM_SIZE];
+    Randomize(random, OLM_ENCRYPT_RANDOM_SIZE);
+
+    size_t res =
+        olm_decrypt(session->session,
+            messageType,
+            encrypted, strlen(encrypted),
+            outBuffer, outBufferCap);
+    
+    if (res != olm_error() && res < outBufferCap)
+        outBuffer[res] = '\0';
+
+    return res != olm_error();
+}
+
+bool
+MatrixMegolmInSessionInit(
+    MatrixMegolmInSession * session,
+    const char * roomId,
+    const char * sessionId,
+    const char * sessionKey, int sessionKeyLen)
+{
+    memset(session, 0, sizeof(MatrixMegolmInSession));
+    
+    strncpy(session->roomId, roomId, sizeof(session->roomId));
+    strncpy(session->id, sessionId, sizeof(session->id));
+    strncpy(session->key, sessionKey, sizeof(session->key));
+
+    session->session =
+        olm_inbound_group_session(session->memory);
+
+    size_t res =
+        olm_init_inbound_group_session(
+        // olm_import_inbound_group_session(
+            session->session,
+            (const uint8_t *)sessionKey, sessionKeyLen);
+    if (res == olm_error()) {
+        printf("Error initializing Megolm session: %s\n", olm_inbound_group_session_last_error(session->session));
+    }
+
+    return res != olm_error();
+}
+
+bool
+MatrixMegolmInSessionDecrypt(
+    MatrixMegolmInSession * session,
+    const char * encrypted, int encryptedLen,
+    char * outDecrypted, int outDecryptedCap)
+{
+    // uint8_t buffer[1024];
+    // memcpy(buffer, encrypted, encryptedLen);
+
+    uint32_t megolmInMessageIndex;
+
+    size_t res =
+        olm_group_decrypt(session->session,
+            (uint8_t *)encrypted, encryptedLen,
+            (uint8_t *)outDecrypted, outDecryptedCap,
+            &megolmInMessageIndex);
+    
+    printf("message index: %d\n", megolmInMessageIndex);
+    
+    if (res == olm_error()) {
+        printf("error decrypting megolm message: %s\n", olm_inbound_group_session_last_error(session->session));
+    }
+    else {
+        printf("decrypted len: %d\n", res);
+    }
+    
+    return true;
+}
+
 // https://matrix.org/docs/guides/end-to-end-encryption-implementation-guide#starting-a-megolm-session
 bool
 MatrixMegolmOutSessionInit(
@@ -112,7 +446,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);
@@ -146,6 +480,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
@@ -158,32 +558,74 @@ MatrixClientInit(
     strcpy(client->server, server);
 
     // init olm account
-    client->olmAccount = olm_account(client->olmAccountMemory);
+    MatrixOlmAccountInit(&client->olmAccount);
 
-    static uint8_t random[OLM_ACCOUNT_RANDOM_SIZE];
-    Randomize(random, OLM_ACCOUNT_RANDOM_SIZE);
+    return true;
+}
 
-    size_t res;
-    res = olm_create_account(
-        client->olmAccount,
-        random,
-        OLM_ACCOUNT_RANDOM_SIZE);
+bool
+MatrixClientSave(
+    MatrixClient * client,
+    const char * filename)
+{
+    FILE * f = fopen(filename, "w");
+    
+    
+    char thisDeviceKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);
+    char thisSigningKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);
+
+
+    fwrite(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);
+    fwrite(thisSigningKey, 1, DEVICE_KEY_SIZE, f);
+    fwrite(client->userId, 1, USER_ID_SIZE, f);
+    fwrite(client->server, 1, SERVER_SIZE, f);
+    fwrite(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);
+    fwrite(client->deviceId, 1, DEVICE_ID_SIZE, f);
+    fwrite(client->expireMs, 1, EXPIRE_MS_SIZE, f);
+    fwrite(client->refreshToken, 1, REFRESH_TOKEN_SIZE, f);
+
+    fwrite(&client->numDevices, sizeof(int), 1, f);
+    for (int i = 0; i < client->numDevices; i++) {
+        fwrite(client->devices[i].deviceId, 1, DEVICE_ID_SIZE, f);
+        fwrite(client->devices[i].deviceKey, 1, DEVICE_KEY_SIZE, f);
+    }
 
-    // set device key
-    static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];
-    res =
-        olm_account_identity_keys(
-            client->olmAccount,
-            deviceKeysJson,
-            OLM_IDENTITY_KEYS_JSON_SIZE);
+    fclose(f);
+    return true;
+}
 
-    mjson_get_string(deviceKeysJson, res,
-        "$.curve25519",
-        client->deviceKey, DEVICE_KEY_SIZE);
-    mjson_get_string(deviceKeysJson, res,
-        "$.ed25519",
-        client->signingKey, SIGNING_KEY_SIZE);
+bool
+MatrixClientLoad(
+    MatrixClient * client,
+    const char * filename)
+{
+    FILE * f = fopen(filename, "r");
+    
+    
+    char thisDeviceKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);
+    char thisSigningKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);
+
+
+    fread(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);
+    fread(thisSigningKey, 1, DEVICE_KEY_SIZE, f);
+    fread(client->userId, 1, USER_ID_SIZE, f);
+    fread(client->server, 1, SERVER_SIZE, f);
+    fread(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);
+    fread(client->deviceId, 1, DEVICE_ID_SIZE, f);
+    fread(client->expireMs, 1, EXPIRE_MS_SIZE, f);
+    fread(client->refreshToken, 1, REFRESH_TOKEN_SIZE, f);
+
+    fread(&client->numDevices, sizeof(int), 1, f);
+    for (int i = 0; i < client->numDevices; i++) {
+        fread(client->devices[i].deviceId, 1, DEVICE_ID_SIZE, f);
+        fread(client->devices[i].deviceKey, 1, DEVICE_KEY_SIZE, f);
+    }
 
+    fclose(f);
     return true;
 }
 
@@ -192,13 +634,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[ACCESS_TOKEN_SIZE-1] = '\0';
 
     return true;
 }
@@ -208,14 +646,207 @@ MatrixClientSetDeviceId(
     MatrixClient * client,
     const char * deviceId)
 {
-    int deviceIdLen = strlen(deviceId);
+    for (int i = 0; i < DEVICE_ID_SIZE-1; i++)
+        client->deviceId[i] = deviceId[i];
+    client->deviceId[DEVICE_ID_SIZE-1] = '\0';
 
-    if (deviceIdLen > DEVICE_ID_SIZE - 1)
-        return false;
+    return true;
+}
 
-    for (int i = 0; i < deviceIdLen; i++)
-        client->deviceId[i] = deviceId[i];
+bool
+MatrixClientSetUserId(
+    MatrixClient * client,
+    const char * userId)
+{
+    for (int i = 0; i < USER_ID_SIZE-1; i++)
+        client->userId[i] = userId[i];
+    client->userId[USER_ID_SIZE-1] = '\0';
+
+    return true;
+}
+
+bool
+MatrixClientGenerateOnetimeKeys(
+    MatrixClient * client,
+    int numberOfKeys)
+{
+    static uint8_t random[OLM_ONETIME_KEYS_RANDOM_SIZE];
+    Randomize(random, OLM_ONETIME_KEYS_RANDOM_SIZE);
+
+    size_t res =
+        olm_account_generate_one_time_keys(client->olmAccount.account,
+            numberOfKeys, random, OLM_ONETIME_KEYS_RANDOM_SIZE);
+
+    return res != olm_error();
+}
+
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload
+bool
+MatrixClientUploadOnetimeKeys(
+    MatrixClient * client)
+{
+    static char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];
+
+    mjson_snprintf(requestBuffer, KEYS_UPLOAD_REQUEST_SIZE,
+        "{");
+
+    static char onetimeKeysBuffer[1024];
+    olm_account_one_time_keys(client->olmAccount.account,
+        onetimeKeysBuffer, 1024);
+
+    const char *keys;
+    int keysLen;
+    mjson_find(onetimeKeysBuffer, strlen(onetimeKeysBuffer), "$.curve25519", &keys, &keysLen);
+
+    int koff, klen, voff, vlen, vtype, off = 0;
+    while ((off = mjson_next(keys, keysLen, off, &koff, &klen, &voff, &vlen, &vtype)) != 0) {
+        static char keyJson[JSON_ONETIME_KEY_SIZE];
+        
+        int keyJsonLen =
+            snprintf(keyJson, JSON_ONETIME_KEY_SIZE,
+                "{\"key\":\"%.*s\"}",
+                vlen-2, keys + voff+1);
+
+        static char keyJsonSigned[JSON_ONETIME_KEY_SIGNED_SIZE];
+
+        JsonSign(client,
+            keyJson, keyJsonLen,
+            keyJsonSigned, JSON_ONETIME_KEY_SIGNED_SIZE);
+        
+        mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),
+            "\"signed_curve25519:%.*s\":%s,",
+            klen-2, keys + koff+1,
+            keyJsonSigned);
+    }
+
+    if (requestBuffer[strlen(requestBuffer)-1] == ',')
+        requestBuffer[strlen(requestBuffer)-1] = '\0';
+
+    mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),
+        "}");
+        
+    // static char onetimeKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];
+    // JsonSign(client,
+    //     requestBuffer, strlen(requestBuffer),
+    //     onetimeKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);
+        
+    // static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];
+    // snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,
+    // "{\"one_time_keys\":%s}", onetimeKeysSignedBuffer);
+    static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];
+    snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,
+    "{\"one_time_keys\":%s}", requestBuffer);
+
+    static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];
+    MatrixHttpPost(client,
+        KEYS_UPLOAD_URL,
+        finalEvent,
+        responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,
+        true);
+
+    return true;
+}
+
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload
+bool
+MatrixClientUploadDeviceKey(
+    MatrixClient * client)
+{
+    char thisDeviceKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);
+    char thisSigningKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);
+
+    static char deviceKeysBuffer[KEYS_UPLOAD_REQUEST_SIZE];
+
+    int deviceKeysBufferLen =
+        mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,
+            "{"
+                "\"algorithms\":[\"m.olm.v1.curve25519-aes-sha2\",\"m.megolm.v1.aes-sha2\"],"
+                "\"device_id\":\"%s\","
+                "\"keys\":{"
+                    "\"curve25519:%s\":\"%s\","
+                    "\"ed25519:%s\":\"%s\""
+                "},"
+                "\"user_id\":\"%s\""
+            "}",
+            client->deviceId,
+            client->deviceId, thisDeviceKey,
+            client->deviceId, thisSigningKey,
+            client->userId);
+
+    static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];
+    JsonSign(client,
+        deviceKeysBuffer, deviceKeysBufferLen,
+        deviceKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);
+    
+    static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];
+    snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,
+    "{\"device_keys\":%s}", deviceKeysSignedBuffer);
+
+    static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];
+    MatrixHttpPost(client,
+        KEYS_UPLOAD_URL,
+        finalEvent,
+        responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,
+        true);
+
+    return true;
+}
 
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysclaim
+bool
+MatrixClientClaimOnetimeKey(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    char * outOnetimeKey, int outOnetimeKeyCap)
+{
+    static char requestBuffer[KEYS_CLAIM_REQUEST_SIZE];
+    mjson_snprintf(requestBuffer, KEYS_CLAIM_REQUEST_SIZE,
+    "{"
+      "\"one_time_keys\":{"
+        "\"%s\":{"
+          "\"%s\":\"signed_curve25519\""
+        "}"
+      "},"
+      "\"timeout\":10000"
+    "}",
+    userId,
+    deviceId);
+
+    static char responseBuffer[KEYS_CLAIM_RESPONSE_SIZE];
+    MatrixHttpPost(client,
+        KEYS_CLAIM_URL,
+        requestBuffer,
+        responseBuffer, KEYS_CLAIM_RESPONSE_SIZE,
+        true);
+    
+    char userIdEscaped[USER_ID_SIZE];
+    JsonEscape(userId, strlen(userId),
+        userIdEscaped, USER_ID_SIZE);
+    
+    static char query[JSON_QUERY_SIZE];
+    snprintf(query, JSON_QUERY_SIZE,
+        "$.one_time_keys.%s.%s",
+        userIdEscaped,
+        deviceId);
+    
+    const char * keyObject;
+    int keyObjectSize;
+    mjson_find(responseBuffer, strlen(responseBuffer),
+        query,
+        &keyObject, &keyObjectSize);
+    
+    int koff, klen, voff, vlen, vtype;
+    mjson_next(keyObject, keyObjectSize, 0,
+        &koff, &klen, &voff, &vlen, &vtype);
+    
+    mjson_get_string(keyObject + voff, vlen,
+        "$.key", outOnetimeKey, outOnetimeKeyCap);
+    
+    // TODO:verify signature
+    
     return true;
 }
 
@@ -231,13 +862,13 @@ MatrixClientLoginPassword(
 
     mjson_snprintf(requestBuffer, LOGIN_REQUEST_SIZE,
         "{"
-            "\"type\": \"m.login.password\","
-            "\"identifier\": {"
-                "\"type\": \"m.id.user\","
-                "\"user\": \"%s\""
+            "\"type\":\"m.login.password\","
+            "\"identifier\":{"
+                "\"type\":\"m.id.user\","
+                "\"user\":\"%s\""
             "},"
-            "\"password\": \"%s\","
-            "\"initial_device_display_name\": \"%s\""
+            "\"password\":\"%s\","
+            "\"initial_device_display_name\":\"%s\""
         "}",
         username,
         password,
@@ -251,10 +882,10 @@ MatrixClientLoginPassword(
             responseBuffer, LOGIN_RESPONSE_SIZE,
             false);
     
-    int responseLen = strlen(responseBuffer);
-    
     if (!result)
         return false;
+    
+    int responseLen = strlen(responseBuffer);
 
     mjson_get_string(responseBuffer, responseLen,
         "$.access_token",
@@ -282,14 +913,14 @@ MatrixClientSendEvent(
 {    
     static char requestUrl[MAX_URL_LEN];
     sprintf(requestUrl,
-        ROOMEVENT_URL, roomId, msgType, (int)time(NULL));
+        ROOM_SEND_URL, roomId, msgType, (int)time(NULL));
 
-    static char responseBuffer[ROOMEVENT_RESPONSE_SIZE];
+    static char responseBuffer[ROOM_SEND_RESPONSE_SIZE];
     bool result =
         MatrixHttpPut(client,
             requestUrl,
             msgBody,
-            responseBuffer, ROOMEVENT_RESPONSE_SIZE,
+            responseBuffer, ROOM_SEND_RESPONSE_SIZE,
             true);
     
     return result;
@@ -305,7 +936,7 @@ MatrixClientSendEventEncrypted(
     const char * msgBody)
 {
     // event json
-    static char requestBuffer[ROOMEVENT_REQUEST_SIZE];
+    static char requestBuffer[ROOM_SEND_REQUEST_SIZE];
     sprintf(requestBuffer,
         "{"
         "\"type\":\"%s\","
@@ -318,7 +949,8 @@ MatrixClientSendEventEncrypted(
 
     // get megolm session
     MatrixMegolmOutSession * outSession;
-    MatrixClientGetMegolmOutSession(client, roomId, &outSession);
+    if (! MatrixClientGetMegolmOutSession(client, roomId, &outSession))
+        MatrixClientNewMegolmOutSession(client, roomId, &outSession);
         
     // encrypt
     static char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];
@@ -326,8 +958,12 @@ MatrixClientSendEventEncrypted(
         requestBuffer,
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);
 
+    char thisDeviceKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);
+    
+
     // encrypted event json
-    const char * senderKey = client->deviceKey;
+    const char * senderKey = thisDeviceKey;
     const char * sessionId = outSession->id;
     const char * deviceId = client->deviceId;
 
@@ -335,15 +971,15 @@ MatrixClientSendEventEncrypted(
     sprintf(encryptedEventBuffer,
         "{"
         "\"algorithm\":\"m.megolm.v1.aes-sha2\","
-        "\"sender_key\":\"%s\","
         "\"ciphertext\":\"%s\","
-        "\"session_id\":\"%s\","
-        "\"device_id\":\"%s\""
+        "\"device_id\":\"%s\","
+        "\"sender_key\":\"%s\","
+        "\"session_id\":\"%s\""
         "}",
-        senderKey,
         encryptedBuffer,
-        sessionId,
-        deviceId);
+        deviceId,
+        senderKey,
+        sessionId);
 
     // send
     return MatrixClientSendEvent(client,
@@ -356,23 +992,69 @@ MatrixClientSendEventEncrypted(
 bool
 MatrixClientSync(
     MatrixClient * client,
-    char * outSyncBuffer, int outSyncCap)
+    char * outSyncBuffer, int outSyncCap,
+    const char * nextBatch)
 {
+    // filter={\"event_fields\":[\"to_device\"]}
+    static char url[MAX_URL_LEN];
+    snprintf(url, MAX_URL_LEN,
+        "/_matrix/client/v3/sync?timeout=%d%s",
+        SYNC_TIMEOUT,
+        strlen(nextBatch) > 0 ? "&since=" : "");
+    
+    int index = strlen(url);
+
+    for (size_t i = 0; i < strlen(nextBatch); i++) {
+        char c = nextBatch[i];
+
+        if (c == '~') {
+            url[index++] = '%';
+            url[index++] = '7';
+            url[index++] = 'E';
+        }
+        else {
+            url[index++] = c;
+        }
+    }
+    url[index] = '\0';
+
     return
         MatrixHttpGet(client,
-            "/_matrix/client/v3/sync",
+            url,
             outSyncBuffer, outSyncCap,
             true);
 }
 
+// https://spec.matrix.org/v1.7/client-server-api/#get_matrixclientv3roomsroomideventeventid
+bool
+MatrixClientGetRoomEvent(
+    MatrixClient * client,
+    const char * roomId,
+    const char * eventId,
+    char * outEvent, int outEventCap)
+{
+    static char url[MAX_URL_LEN];
+    snprintf(url, MAX_URL_LEN,
+        "/_matrix/client/v3/rooms/%s/event/%s",
+            roomId,
+            eventId);
+
+    return
+        MatrixHttpGet(client,
+            url,
+            outEvent, outEventCap,
+            true);
+}
+
 bool
 MatrixClientShareMegolmOutSession(
     MatrixClient * client,
+    const char * userId,
     const char * deviceId,
     MatrixMegolmOutSession * session)
 {
     // generate room key event
-    char eventBuffer[KEY_SHARE_EVENT_LEN];
+    static char eventBuffer[KEY_SHARE_EVENT_LEN];
     sprintf(eventBuffer,
         "{"
             "\"algorithm\":\"m.megolm.v1.aes-sha2\","
@@ -385,42 +1067,46 @@ MatrixClientShareMegolmOutSession(
         session->key
     );
 
-    // get olm session
-    MatrixOlmSession * olmSession;
-    MatrixClientGetOlmSession(client, deviceId, &olmSession);
-
-    // encrypt
-    char encryptedBuffer[KEY_SHARE_EVENT_LEN];
-    MatrixOlmSessionEncrypt(olmSession,
-        eventBuffer,
-        encryptedBuffer, KEY_SHARE_EVENT_LEN);
-
     // send
     MatrixClientSendToDeviceEncrypted(client,
-        client->userId,
+        userId,
         deviceId,
-        encryptedBuffer,
+        eventBuffer,
         "m.room_key");
 
     return true;
 }
 
-// bool
-// MatrixClientSetMegolmOutSession(
-//     MatrixClient * client,
-//     const char * roomId,
-//     MatrixMegolmOutSession session)
-// {
-//     if (client->numMegolmOutSessions < 10)
-//     {
-//         session.roomId = roomId;
-//         client->megolmOutSessions[client->numMegolmOutSessions] = session;
-//         client->numMegolmOutSessions++;
+bool
+MatrixClientShareMegolmOutSessionTest(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    MatrixMegolmOutSession * session)
+{
+    // generate room key event
+    char eventBuffer[KEY_SHARE_EVENT_LEN];
+    sprintf(eventBuffer,
+        "{"
+            "\"algorithm\":\"m.megolm.v1.aes-sha2\","
+            "\"room_id\":\"%s\","
+            "\"session_id\":\"%s\","
+            "\"session_key\":\"%s\""
+        "}",
+        session->roomId,
+        session->id,
+        session->key
+    );
+
+    // send
+    MatrixClientSendToDevice(client,
+        userId,
+        deviceId,
+        eventBuffer,
+        "m.room_key");
 
-//         return true;
-//     }
-//     return false;
-// }
+    return true;
+}
 
 bool
 MatrixClientGetMegolmOutSession(
@@ -437,14 +1123,25 @@ MatrixClientGetMegolmOutSession(
         }
     }
 
+    return false;
+}
+
+bool
+MatrixClientNewMegolmOutSession(
+    MatrixClient * client,
+    const char * roomId,
+    MatrixMegolmOutSession ** outSession)
+{
     if (client->numMegolmOutSessions < NUM_MEGOLM_SESSIONS)
     {
-        MatrixMegolmOutSessionInit(
-            &client->megolmOutSessions[client->numMegolmOutSessions],
+        MatrixMegolmOutSession * result =
+            &client->megolmOutSessions[client->numMegolmOutSessions];
+        
+        MatrixMegolmOutSessionInit(result,
             roomId);
 
-        *outSession = &client->megolmOutSessions[client->numMegolmOutSessions];
-        
+        *outSession = result;
+
         client->numMegolmOutSessions++;
 
         return true;
@@ -454,8 +1151,139 @@ MatrixClientGetMegolmOutSession(
 }
 
 bool
-MatrixClientGetOlmSession(
+MatrixClientGetMegolmInSession(
+    MatrixClient * client,
+    const char * roomId, int roomIdLen,
+    const char * sessionId, int sessionIdLen,
+    MatrixMegolmInSession ** outSession)
+{
+    for (int i = 0; i < client->numMegolmInSessions; i++)
+    {
+        if (strncmp(client->megolmInSessions[i].roomId, roomId, roomIdLen) == 0 &&
+            strncmp(client->megolmInSessions[i].id, sessionId, sessionIdLen) == 0)
+        {
+            *outSession = &client->megolmInSessions[i];
+            return true;
+        }
+    }
+
+    return false;
+}
+
+bool
+MatrixClientNewMegolmInSession(
+    MatrixClient * client,
+    const char * roomId,
+    const char * sessionId,
+    const char * sessionKey,
+    MatrixMegolmInSession ** outSession)
+{
+    if (client->numMegolmInSessions < NUM_MEGOLM_SESSIONS)
+    {
+        MatrixMegolmInSession * result =
+            &client->megolmInSessions[client->numMegolmInSessions];
+        
+        MatrixMegolmInSessionInit(result,
+            roomId,
+            sessionId,
+            sessionKey, strlen(sessionKey));
+        
+        *outSession = result;
+
+        client->numMegolmInSessions++;
+
+        return true;
+    }
+
+    return false;
+}
+
+bool
+MatrixClientRequestMegolmInSession(
     MatrixClient * client,
+    const char * roomId,
+    const char * sessionId,
+    const char * senderKey,
+    const char * userId,
+    const char * deviceId)
+{
+    // TODO: cancel requests
+    MatrixClientSendDummy(client, userId, deviceId);
+
+    static char event[ROOMKEY_REQUEST_SIZE];
+    snprintf(event, ROOMKEY_REQUEST_SIZE,
+        "{"
+            "\"action\":\"request\","
+            "\"body\":{"
+                "\"algorithm\":\"m.megolm.v1.aes-sha2\","
+                "\"room_id\":\"%s\","
+                "\"sender_key\":\"%s\","
+                "\"session_id\":\"%s\""
+            "},"
+            "\"request_id\":\"%d\","
+            "\"requesting_device_id\":\"%s\""
+        "}",
+        roomId,
+        senderKey,
+        sessionId,
+        time(NULL),
+        client->deviceId);
+
+    
+    MatrixClientSendToDevice(client,
+        userId,
+        deviceId,
+        event,
+        "m.room_key_request");
+
+    return true;
+}
+
+bool
+MatrixClientGetOlmSessionIn(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId,
+    const char * encrypted,
+    MatrixOlmSession ** outSession)
+{
+    for (int i = 0; i < client->numOlmSessions; i++)
+    {
+        if (strcmp(client->olmSessions[i].deviceId, deviceId) == 0)
+        {
+            *outSession = &client->olmSessions[i];
+            return true;
+        }
+    }
+
+    if (client->numOlmSessions < NUM_OLM_SESSIONS)
+    {
+        static char deviceKey[DEVICE_KEY_SIZE];
+        MatrixClientRequestDeviceKey(client,
+            deviceId,
+            deviceKey, DEVICE_KEY_SIZE);
+
+        MatrixOlmSessionFrom(
+            &client->olmSessions[client->numOlmSessions],
+            client->olmAccount.account,
+            deviceId,
+            deviceKey,
+            encrypted);
+
+        *outSession = &client->olmSessions[client->numOlmSessions];
+        
+        client->numOlmSessions++;
+
+        return true;
+    }
+
+    return false;
+}
+
+bool
+MatrixClientGetOlmSessionOut(
+    MatrixClient * client,
+    const char * userId,
     const char * deviceId,
     MatrixOlmSession ** outSession)
 {
@@ -470,9 +1298,23 @@ MatrixClientGetOlmSession(
 
     if (client->numOlmSessions < NUM_OLM_SESSIONS)
     {
-        MatrixOlmSessionInit(
+        static char deviceKey[DEVICE_KEY_SIZE];
+        MatrixClientRequestDeviceKey(client,
+            deviceId,
+            deviceKey, DEVICE_KEY_SIZE);
+
+        char onetimeKey[ONETIME_KEY_SIZE];
+        MatrixClientClaimOnetimeKey(client,
+            userId,
+            deviceId,
+            onetimeKey, ONETIME_KEY_SIZE);
+
+        MatrixOlmSessionTo(
             &client->olmSessions[client->numOlmSessions],
-            deviceId);
+            client->olmAccount.account,
+            deviceId,
+            deviceKey,
+            onetimeKey);
 
         *outSession = &client->olmSessions[client->numOlmSessions];
         
@@ -500,8 +1342,8 @@ MatrixClientSendToDevice(
     static char eventBuffer[TODEVICE_EVENT_SIZE];
     snprintf(eventBuffer, TODEVICE_EVENT_SIZE,
         "{"
-            "\"messages\": {"
-                "\"%s\": {"
+            "\"messages\":{"
+                "\"%s\":{"
                     "\"%s\":%s"
                 "}"
             "}"
@@ -510,14 +1352,16 @@ MatrixClientSendToDevice(
         deviceId,
         message);
 
-    static char responseBuffer[ROOMEVENT_RESPONSE_SIZE];
+    static char responseBuffer[ROOM_SEND_RESPONSE_SIZE];
     bool result =
         MatrixHttpPut(client,
             requestUrl,
             eventBuffer,
-            responseBuffer, ROOMEVENT_RESPONSE_SIZE,
+            responseBuffer, ROOM_SEND_RESPONSE_SIZE,
             true);
     
+    printf("%s\n", responseBuffer);
+    
     return result;
 }
 
@@ -531,33 +1375,37 @@ MatrixClientSendToDeviceEncrypted(
 {
     // get olm session
     MatrixOlmSession * olmSession;
-    MatrixClientGetOlmSession(client, deviceId, &olmSession);
+    MatrixClientGetOlmSessionOut(client, userId, deviceId, &olmSession);
 
     // create event json
-    char deviceKey[DEVICE_KEY_SIZE];
-    MatrixClientGetDeviceKey(client, deviceId, deviceKey, DEVICE_KEY_SIZE);
-    const char * senderKey = client->deviceKey;
+    char targetDeviceKey[DEVICE_KEY_SIZE];
+    MatrixClientRequestDeviceKey(client, deviceId, targetDeviceKey, DEVICE_KEY_SIZE);
+    char targetSigningKey[SIGNING_KEY_SIZE];
+    MatrixClientRequestSigningKey(client, deviceId, targetSigningKey, SIGNING_KEY_SIZE);
     
+    char thisSigningKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);
+
     static char eventBuffer[TODEVICE_EVENT_SIZE];
     sprintf(eventBuffer,
         "{"
-        "\"type\": \"%s\","
-        "\"content\": \"%s\","
-        "\"sender\": \"%s\","
-        "\"recipient\": \"%s\","
-        "\"recipient_keys\": {"
-          "\"ed25519\": \"%s\""
+        "\"type\":\"%s\","
+        "\"content\":%s,"
+        "\"sender\":\"%s\","
+        "\"recipient\":\"%s\","
+        "\"recipient_keys\":{"
+          "\"ed25519\":\"%s\""
         "},"
-        "\"keys\": {"
-          "\"ed25519\": \"%s\""
+        "\"keys\":{"
+          "\"ed25519\":\"%s\""
         "}"
         "}",
         msgType,
         message,
         client->userId,
         userId, // recipient user id
-        deviceKey, // recipient device key
-        client->deviceKey);
+        targetSigningKey, // recipient device key
+        thisSigningKey);
 
     // encrypt
     static char encryptedBuffer[ENCRYPTED_REQUEST_SIZE];
@@ -565,22 +1413,28 @@ MatrixClientSendToDeviceEncrypted(
         eventBuffer,
         encryptedBuffer, ENCRYPTED_REQUEST_SIZE);
 
+    char thisDeviceKey[DEVICE_KEY_SIZE];
+    MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);
+
+
     static char encryptedEventBuffer[ENCRYPTED_EVENT_SIZE];
     sprintf(encryptedEventBuffer,
         "{"
-        "\"algorithm\":\"m.megolm.v1.aes-sha2\","
-        "\"sender_key\":\"%s\","
+        "\"algorithm\":\"m.olm.v1.curve25519-aes-sha2\","
         "\"ciphertext\":{"
           "\"%s\":{"
             "\"body\":\"%s\","
-            "\"type\":\"%d\""
+            "\"type\":%d"
           "}"
-        "}"
+        "},"
+        "\"device_id\":\"%s\","
+        "\"sender_key\":\"%s\""
         "}",
-        senderKey,
-        deviceKey,
+        targetDeviceKey,
         encryptedBuffer,
-        olmSession->type);
+        olm_session_has_received_message(olmSession->session),
+        client->deviceId,
+        thisDeviceKey);
 
     // send
     return MatrixClientSendToDevice(
@@ -591,6 +1445,20 @@ MatrixClientSendToDeviceEncrypted(
         "m.room.encrypted");
 }
 
+bool
+MatrixClientSendDummy(
+    MatrixClient * client,
+    const char * userId,
+    const char * deviceId)
+{
+    return MatrixClientSendToDeviceEncrypted(
+        client,
+        userId,
+        deviceId,
+        "{}",
+        "m.dummy");
+}
+
 bool
 MatrixClientFindDevice(
     MatrixClient * client,
@@ -613,14 +1481,21 @@ MatrixClientFindDevice(
 }
 
 bool
-MatrixClientGetDeviceKey(
+MatrixClientRequestDeviceKey(
     MatrixClient * client,
     const char * deviceId,
     char * outDeviceKey, int outDeviceKeyCap)
 {
+    MatrixDevice * device;
+    
+    if (MatrixClientFindDevice(client, deviceId, &device))
+    {
+        strncpy(outDeviceKey, device->deviceKey, outDeviceKeyCap);
+        return true;
+    }
+
     MatrixClientRequestDeviceKeys(client);
     
-    MatrixDevice * device;
     if (MatrixClientFindDevice(client, deviceId, &device))
     {
         strncpy(outDeviceKey, device->deviceKey, outDeviceKeyCap);
@@ -630,73 +1505,124 @@ MatrixClientGetDeviceKey(
     return false;
 }
 
+bool
+MatrixClientRequestSigningKey(
+    MatrixClient * client,
+    const char * deviceId,
+    char * outSigningKey, int outSigningKeyCap)
+{
+    MatrixDevice * device;
+    
+    if (MatrixClientFindDevice(client, deviceId, &device))
+    {
+        strncpy(outSigningKey, device->signingKey, outSigningKeyCap);
+        return true;
+    }
+
+    MatrixClientRequestDeviceKeys(client);
+    
+    if (MatrixClientFindDevice(client, deviceId, &device))
+    {
+        strncpy(outSigningKey, device->signingKey, outSigningKeyCap);
+        return true;
+    }
+
+    return false;
+}
+
 // https://spec.matrix.org/v1.6/client-server-api/#post_matrixclientv3keysquery
 bool
 MatrixClientRequestDeviceKeys(
     MatrixClient * client)
 {
-    char userIdEscaped[USER_ID_SIZE];
+    static char userIdEscaped[USER_ID_SIZE];
     JsonEscape(client->userId, strlen(client->userId),
         userIdEscaped, USER_ID_SIZE);
 
-    char request[KEYS_QUERY_REQUEST_SIZE];
+    static char request[KEYS_QUERY_REQUEST_SIZE];
     snprintf(request, KEYS_QUERY_REQUEST_SIZE,
-        "{\"device_keys\":{\"%s\":[]}}", userIdEscaped);
+        "{\"device_keys\":{\"%s\":[]}}", client->userId);
 
-    char responseBuffer[KEYS_QUERY_RESPONSE_SIZE];
+    static char responseBuffer[KEYS_QUERY_RESPONSE_SIZE];
     bool requestResult = MatrixHttpPost(client,
         KEYS_QUERY_URL,
         request,
         responseBuffer, KEYS_QUERY_RESPONSE_SIZE,
         true);
 
-    if (requestResult)
-    {
-        // query for retrieving device keys for user id
-        char query[JSON_QUERY_SIZE];
-        snprintf(query, JSON_QUERY_SIZE,
-            "$.device_keys.%s", userIdEscaped);
-        
-        const char * s;
-        int slen;
-        mjson_find(responseBuffer, strlen(responseBuffer),
-            query, &s, &slen);
+    if (! requestResult)
+        return false;
 
-        // loop over keys
-        
-        int koff, klen, voff, vlen, vtype, off;
-        for (off = 0; (off = mjson_next(s, slen, off, &koff, &klen,
-                                        &voff, &vlen, &vtype)) != 0; ) {
-            const char * key = s + koff;
-            const char * val = s + voff;
-
-            // set device id, "key" is the JSON key
-            MatrixDevice d;
-            strncpy(d.deviceId, key, klen);
-
-            // look for device key in value
-            char deviceKeyQuery[JSON_QUERY_SIZE];
-            snprintf(deviceKeyQuery, JSON_QUERY_SIZE,
-                "$.keys.curve25519:%.*s", klen, key);
-            mjson_get_string(val, vlen,
-                deviceKeyQuery, d.deviceKey, DEVICE_KEY_SIZE);
-
-            // add device
-            if (client->numDevices < NUM_DEVICES)
-            {
+    // query for retrieving device keys for user id
+    static char query[JSON_QUERY_SIZE];
+    snprintf(query, JSON_QUERY_SIZE,
+        "$.device_keys.%s", userIdEscaped);
+    
+    const char * s;
+    int slen;
+    mjson_find(responseBuffer, strlen(responseBuffer),
+        query, &s, &slen);
+    
+    // loop over keys
+    
+    int koff, klen, voff, vlen, vtype, off = 0;
+    for (off = 0; (off = mjson_next(s, slen, off, &koff, &klen,
+                                    &voff, &vlen, &vtype)) != 0; ) {
+        const char * key = s + koff;
+        const char * val = s + voff;
+
+        // set device id, "key" is the JSON key
+        MatrixDevice d;
+        snprintf(d.deviceId, DEVICE_ID_SIZE,
+            "%.*s", klen-2, key+1);
+
+        // look for device key in value
+        static char deviceKeyQuery[JSON_QUERY_SIZE];
+        snprintf(deviceKeyQuery, JSON_QUERY_SIZE,
+            "$.keys.curve25519:%s", d.deviceId);
+        mjson_get_string(val, vlen,
+            deviceKeyQuery, d.deviceKey, DEVICE_KEY_SIZE);
+
+        // look for signing key in value
+        static char signingKeyQuery[JSON_QUERY_SIZE];
+        snprintf(signingKeyQuery, JSON_QUERY_SIZE,
+            "$.keys.ed25519:%s", d.deviceId);
+        mjson_get_string(val, vlen,
+            signingKeyQuery, d.signingKey, SIGNING_KEY_SIZE);
+
+        // add device
+        if (client->numDevices < NUM_DEVICES)
+        {
+            bool foundDevice = false;
+            for (int i = 0; i < client->numDevices; i++)
+                if (strcmp(client->devices[i].deviceId, d.deviceId) == 0)
+                    foundDevice = true;
+
+            if (! foundDevice) {
+                printf("new device: %s %s %s\n", d.deviceId, d.deviceKey, d.signingKey);
                 client->devices[client->numDevices] = d;
                 client->numDevices++;
             }
-            else
-            {
-                return false;
-            }
         }
-
-        return true;
-    }
-    else
-    {
-        return false;
+        else
+        {
+            return false;
+        }
     }
+
+    return true;
 }
+
+bool
+MatrixClientDeleteDevice(
+    MatrixClient * client)
+{
+    static char deleteRequest[1024];
+    snprintf(deleteRequest, 1024,
+        "{\"devices\":[\"%s\"]}",
+        client->deviceId);
+    static char deleteResponse[1024];
+    bool res = MatrixHttpPost(client, "/_matrix/client/v3/delete_devices",
+        deleteRequest, deleteResponse, 1024, true);
+    return res;
+}
\ No newline at end of file