able to send encrypted messages :)

diff --git a/Makefile b/Makefile
index e508b2e7310b52260cb8d8fdbdcdadd20fea6bc0..c82a055818d022c5b46d1da3616da12d887da81a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CC=clang\r
+CC=clang++\r
 \r
 C_OPTS=-Wall -Wextra -pedantic\r
 C_OPTS+=src/matrix.c\r
@@ -13,7 +13,7 @@ C_OPTS+=-l ws2_32
 C_OPTS+=-l ssl\r
 C_OPTS+=-l crypto\r
 C_OPTS+=-l stdc++\r
-C_OPTS+=out/olm/libolm.a\r
+C_OPTS+=out/olmdbg/libolm.a\r
 C_OPTS+=-D MG_ENABLE_OPENSSL=1\r
 C_OPTS+=-fuse-ld=lld.exe -g -gcodeview -Wl,/debug,/pdb:out/test.pdb\r
 # C_OPTS+=-I ext/curl/include/\r

diff --git a/Todo.md b/Todo.md
index 3e5dc6b3fd0e9d044edccdcd80f25042fa9992c4..6698a4c331d6b49b613a1c416b5718a8e7c76484 100644 (file)
--- a/Todo.md
+++ b/Todo.md
@@ -5,14 +5,14 @@
 - automate script to generate header with size defines\r
 \r
 # Matrix Lib\r
-- manage keys\r
-- upload keys\r
++ manage keys\r
++ upload keys\r
 - create olm session\r
   - incoming\r
-  - outgoing\r
-- store keys/sessions\r
+  + outgoing\r
++ store keys/sessions\r
 - respond to events\r
   - room_key_request\r
-- add client saving/loading\r
-- esp compatibility\r
++ add client saving/loading\r
++ esp compatibility\r
 - http requests in chunks/dynamically allocated
\ No newline at end of file

diff --git a/examples/Cli.c b/examples/Cli.c
index daf79e9c21ca6ccc2ec35678a14d4194b5c3360d..56c23e17f4969a5a10404c162367d5a30167e91b 100644 (file)
--- a/examples/Cli.c
+++ b/examples/Cli.c
@@ -5,8 +5,6 @@
 #include <matrix.h>\r
 \r
 #define SERVER       "https://matrix.org"\r
-#define ACCESS_TOKEN "syt_cHNjaG8_yBvTjVTquGCikvsAenOJ_49mBMO"\r
-#define DEVICE_ID    "MAZNCCZLBR"\r
 #define USER_ID      "@pscho:matrix.org"\r
 #define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
 \r
@@ -70,29 +68,59 @@ Usage(
     printf("Usage: %s %s\n", cmd, args);\r
 }\r
 \r
-void\r
+bool\r
 ExecuteCommand(\r
     MatrixClient * client,\r
     const char * cmd,\r
     int nargs, char ** args\r
 ) {\r
-#define CHECK_ARGS(N, ARGS) if (nargs != N) { Usage(cmd, ARGS); return; }\r
-    /**/ if (CheckCommand(cmd, "devicekey")) {\r
-        printf("%s\n", client->deviceKey);\r
+#define CHECK_ARGS(N, ARGS) if (nargs != N) { Usage(cmd, ARGS); return true; }\r
+\r
+    /**/ if (CheckCommand(cmd, "exit")) {\r
+        return false;\r
+    }\r
+    else if (CheckCommand(cmd, "devicekey")) {\r
+        static char key[DEVICE_KEY_SIZE];\r
+        if (MatrixOlmAccountGetDeviceKey(&client->olmAccount, key, DEVICE_KEY_SIZE))\r
+            printf("%s\n", key);\r
+    }\r
+    else if (CheckCommand(cmd, "accesstoken")) {\r
+        printf("%s\n", client->accessToken);\r
     }\r
     else if (CheckCommand(cmd, "genkeys")) {\r
         CHECK_ARGS(1, "<number of keys>")\r
 \r
         MatrixClientGenerateOnetimeKeys(client, atoi(args[0]));\r
     }\r
-    else if (CheckCommand(cmd, "uploadkeys")) {\r
+    else if (CheckCommand(cmd, "uploadonetimekeys")) {\r
         MatrixClientUploadOnetimeKeys(client);\r
     }\r
+    else if (CheckCommand(cmd, "uploaddevicekey")) {\r
+        MatrixClientUploadDeviceKey(client);\r
+    }\r
     else if (CheckCommand(cmd, "onetimekeys")) {\r
         static char buffer[1024];\r
         olm_account_one_time_keys(client->olmAccount.account, buffer, 1024);\r
         printf("%s\n", buffer);\r
     }\r
+    else if (CheckCommand(cmd, "sendto")) {\r
+        CHECK_ARGS(3, "<device_id> <msgtype> <msg>")\r
+\r
+        MatrixClientSendToDevice(client,\r
+            USER_ID,\r
+            args[0],\r
+            args[2],\r
+            args[1]);\r
+    }\r
+    else if (CheckCommand(cmd, "sendtoe")) {\r
+        CHECK_ARGS(3, "<device_id> <msgtype> <msg>")\r
+\r
+        MatrixClientSendToDeviceEncrypted(client,\r
+            USER_ID,\r
+            args[0],\r
+            args[2],\r
+            args[1]);\r
+    }\r
     else if (CheckCommand(cmd, "getkeys")) {\r
         MatrixClientRequestDeviceKeys(client);\r
         for (int i = 0; i < client->numDevices; i++)\r
@@ -115,6 +143,14 @@ ExecuteCommand(
             "  ", mjson_print_fixed_buf, &fb);\r
         printf("%.*s\n", fb.len, fb.ptr);\r
     }\r
+    else if (CheckCommand(cmd, "login")) {\r
+        CHECK_ARGS(3, "<username> <password> <displayname>")\r
+\r
+        MatrixClientLoginPassword(client,\r
+            args[0],\r
+            args[1],\r
+            args[2]);\r
+    }\r
     else if (CheckCommand(cmd, "save")) {\r
         CHECK_ARGS(1, "<filename>")\r
 \r
@@ -138,6 +174,19 @@ ExecuteCommand(
             "m.room.message",\r
             body);\r
     }\r
+    else if (CheckCommand(cmd, "sendencrypted")) {\r
+        CHECK_ARGS(2, "<room_id> <message>")\r
+\r
+        static char body[1024];\r
+        snprintf(body, 1024,\r
+            "{\"body\":\"%s\",\"msgtype\":\"m.text\"}",\r
+            args[1]);\r
+\r
+        MatrixClientSendEventEncrypted(client,\r
+            args[0],\r
+            "m.room.message",\r
+            body);\r
+    }\r
     else if (CheckCommand(cmd, "setuserid")) {\r
         CHECK_ARGS(1, "<user_id>")\r
 \r
@@ -212,6 +261,8 @@ ExecuteCommand(
         printf("Unknown command\n");\r
     }\r
 #undef CHECK_ARGS\r
+\r
+    return true;\r
 }\r
 \r
 int\r
@@ -223,12 +274,13 @@ main(void)
     \r
     MatrixHttpInit(&client);\r
 \r
-    MatrixClientSetAccessToken(&client,\r
-        ACCESS_TOKEN);\r
-    MatrixClientSetDeviceId(&client,\r
-        DEVICE_ID);\r
-    MatrixClientSetUserId(&client,\r
-        USER_ID);\r
+\r
+    MatrixClientSetUserId(&client, USER_ID);\r
+    MatrixClientLoginPassword(&client, "@pscho:matrix.org", "Wc23EbmB9G3faMq", "abc");\r
+    MatrixClientGenerateOnetimeKeys(&client, 10);\r
+    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientUploadOnetimeKeys(&client);\r
+\r
 \r
     static char cmd[BUFFER_SIZE];\r
     static char args_[NUMBER_ARGS][BUFFER_SIZE];\r
@@ -236,13 +288,18 @@ main(void)
     for (int i = 0; i < NUMBER_ARGS; i++)\r
         args[i] = args_[i];\r
     int nargs;\r
-    do {\r
+    while (1) {\r
         GetCommand(cmd, &nargs, args);\r
 \r
-        ExecuteCommand(&client, cmd, nargs, args);\r
-        \r
-    } while (strcmp(cmd, "exit") != 0);\r
+        bool res =\r
+            ExecuteCommand(&client, cmd, nargs, args);\r
         \r
+        if (! res)\r
+            break;\r
+    }\r
+    \r
+    MatrixClientDeleteDevice(&client);\r
+\r
     MatrixHttpDeinit(&client);\r
 \r
     return 0;\r

diff --git a/examples/Cli.rdbg b/examples/Cli.rdbg
new file mode 100644 (file)
index 0000000..f669888
Binary files /dev/null and b/examples/Cli.rdbg differ

diff --git a/examples/OlmJS.c b/examples/OlmJS.c
new file mode 100644 (file)
index 0000000..ea32858
--- /dev/null
+++ b/examples/OlmJS.c
@@ -0,0 +1,66 @@
+#include <stdio.h>\r
+#include <matrix.h>\r
+\r
+#define SERVER            "https://matrix.org"\r
+#define USER_ID           "@pscho:matrix.org"\r
+#define DEVICE_ID         "BYFEHWFCIV"\r
+#define ACCESS_TOKEN      "syt_cHNjaG8_GgutapSEvKWBQYTqjxQw_2UOtb4"\r
+\r
+char ROOM_ID[] =           "!gngUimLZDmREazBCUv:matrix.org";\r
+char TARGET_DEVICE_ID[] =  "ULZZOKJBYN";\r
+char TARGET_DEVICE_KEY[] = "cjP41XzRlY+pd8DoiBuKQJj9o15mrx6gkrpqTkAPZ2c";\r
+char OLM_PICKLE_KEY[] =    "DEFAULT_KEY";\r
+char OLM_ACC_PICKLED[] =   "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";\r
+char OLM_SESS_PICKLED[] =  "zzgNbSTtwx2T1XjDqMuUSbk5aiIUZAsi4emwn8Ooxhxg1TVA73c+p4j9WypfAJjKoJin9cf23k00m1G/6wmISG6WB6KE9FO1jCTYYyDJX+GQxfUVvYwMlavZ9lN2Wax+wxP+3wJ0XZn7aFdjl//I7/lI3kCZGBPnNH+zWjv+19vJyOqz4SGKVTO1ojrds7tA7D7BOT/VxLziQK0XS/k604mWuSJd6BfMmU1bsadSxL2nT0UfhzJckfBkO7q/06twsnIwewKoskv5ZlCo5THoCxinm6aaC/VWozgU7n609xWGtuYdG2C6ijMmAjrfpNFAD9BNu/yqvU/ETfdMDYkhm+RDPlogr2mP";\r
+\r
+// session id\r
+// "dBe606wVTSvCSqvSz5pSHtH+f8CvjoB3od6UqOJkssI"\r
+\r
+int\r
+main(void)\r
+{\r
+    MatrixClient client;\r
+    MatrixClientInit(&client,\r
+        SERVER);\r
+    \r
+    MatrixHttpInit(&client);\r
+\r
+    MatrixClientSetUserId(&client, USER_ID);\r
+    MatrixClientSetDeviceId(&client, DEVICE_ID);\r
+    MatrixClientSetAccessToken(&client, ACCESS_TOKEN);\r
+\r
+    MatrixOlmAccountUnpickle(&client.olmAccount,\r
+        OLM_ACC_PICKLED, strlen(OLM_ACC_PICKLED),\r
+        OLM_PICKLE_KEY, strlen(OLM_PICKLE_KEY));\r
+\r
+    // client.numOlmSessions = 1;\r
+    // MatrixOlmSessionUnpickle(&client.olmSessions[0],\r
+    //     TARGET_DEVICE_ID,\r
+    //     OLM_SESS_PICKLED, strlen(OLM_SESS_PICKLED),\r
+    //     OLM_PICKLE_KEY, strlen(OLM_PICKLE_KEY));\r
+    \r
+    // char id[1024];\r
+    // int idLen = olm_session_id(client.olmSessions[0].session, id, 1024);\r
+    // printf("id: %s\n", id, idLen);\r
+    \r
+    // create megolmsession\r
+    MatrixMegolmOutSession * megolmOutSession;\r
+    MatrixClientGetMegolmOutSession(&client,\r
+        ROOM_ID,\r
+        &megolmOutSession);\r
+    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
+\r
+    MatrixClientShareMegolmOutSession(&client,\r
+        USER_ID,\r
+        TARGET_DEVICE_ID,\r
+        megolmOutSession);\r
+    \r
+    // MatrixClientSendEventEncrypted(&client,\r
+    //     ROOM_ID,\r
+    //     "m.room.message",\r
+    //     "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
+\r
+    MatrixHttpDeinit(&client);\r
+\r
+    return 0;\r
+}\r

diff --git a/examples/OlmJS.rdbg b/examples/OlmJS.rdbg
new file mode 100644 (file)
index 0000000..dbd3618
Binary files /dev/null and b/examples/OlmJS.rdbg differ

diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c
index 0005592693ecf67bb2c4f3ecafad1fa8965ef451..df1d27291185f9a2329226d4c52dd9b1f7b0aea1 100644 (file)
--- a/examples/SendEncrypted.c
+++ b/examples/SendEncrypted.c
@@ -2,8 +2,6 @@
 #include <stdio.h>\r
 \r
 #define SERVER       "https://matrix.org"\r
-#define ACCESS_TOKEN "syt_cHNjaG8_yBvTjVTquGCikvsAenOJ_49mBMO"\r
-#define DEVICE_ID    "MAZNCCZLBR"\r
 #define USER_ID      "@pscho:matrix.org"\r
 #define ROOM_ID      "!XKFUjAsGrSSrpDFIxB:matrix.org"\r
 \r
@@ -16,32 +14,55 @@ main(void)
     \r
     MatrixHttpInit(&client);\r
 \r
-    MatrixClientSetAccessToken(&client,\r
-        ACCESS_TOKEN);\r
-    MatrixClientSetDeviceId(&client,\r
-        DEVICE_ID);\r
-    MatrixClientSetUserId(&client,\r
-        USER_ID);\r
+    MatrixClientSetUserId(&client, USER_ID);\r
 \r
+    MatrixClientLoginPassword(&client,\r
+        "pscho",\r
+        "Wc23EbmB9G3faMq",\r
+        "Test1");\r
 \r
-    MatrixClientUploadDeviceKeys(&client);\r
+    MatrixClientUploadDeviceKey(&client);\r
+    MatrixClientGenerateOnetimeKeys(&client, 10);\r
+    MatrixClientUploadOnetimeKeys(&client);\r
 \r
-    MatrixClientSendEventEncrypted(&client,\r
+    // // get device key\r
+    // static char deviceKey[128];\r
+    // MatrixClientGetDeviceKey(&client,\r
+    //     "ULZZOKJBYN",\r
+    //     deviceKey, 128);\r
+    // printf("device key for %s: %s\n", "ULZZOKJBYN", deviceKey);\r
+\r
+    // create megolmsession\r
+    MatrixMegolmOutSession * megolmOutSession;\r
+    MatrixClientGetMegolmOutSession(&client,\r
         ROOM_ID,\r
-        "m.room.message",\r
-        "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
+        &megolmOutSession);\r
+    printf("megolm session id: %.10s... key: %.10s...\n", megolmOutSession->id, megolmOutSession->key);\r
 \r
-    MatrixClientSendToDeviceEncrypted(&client,\r
-        USER_ID,\r
-        "ULZZOKJBYN",\r
-        "{}",\r
-        "m.dummy");\r
+    // // create olmsession\r
+    // MatrixOlmSession * olmSession;\r
+    // MatrixClientGetOlmSession(&client,\r
+    //     USER_ID,\r
+    //     "ULZZOKJBYN",\r
+    //     &olmSession);\r
+    // printf("olm session created\n");\r
 \r
     MatrixClientShareMegolmOutSession(&client,\r
         USER_ID,\r
         "ULZZOKJBYN",\r
-        &client.megolmOutSessions[0]);\r
+        megolmOutSession);\r
+    // MatrixClientShareMegolmOutSessionTest(&client,\r
+    //     USER_ID,\r
+    //     "ULZZOKJBYN",\r
+    //     megolmOutSession);\r
+\r
+    MatrixClientSendEventEncrypted(&client,\r
+        ROOM_ID,\r
+        "m.room.message",\r
+        "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}");\r
         \r
+    MatrixClientDeleteDevice(&client);\r
+\r
     MatrixHttpDeinit(&client);\r
 \r
     return 0;\r

diff --git a/examples/SendEncrypted.rdbg b/examples/SendEncrypted.rdbg
index 120f0a069b22200070fddddd78bb9931551b6ad0..8b74b2d81c87f9910493e34731ea1c84dd39520b 100644 (file)
Binary files a/examples/SendEncrypted.rdbg and b/examples/SendEncrypted.rdbg differ

diff --git a/src/matrix.c b/src/matrix.c
index de936de0d47bc31247d4e5a5f4dba95a4bd808ce..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_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
@@ -88,6 +88,9 @@ bool JsonSign(
             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
@@ -100,7 +103,7 @@ bool JsonSign(
                 "}"\r
             "}",\r
             client->userId,\r
-            client->deviceId,\r
+            "1",\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
-// 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
@@ -158,12 +208,38 @@ MatrixOlmSessionTo(
             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
+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
@@ -306,21 +382,6 @@ MatrixClientInit(
     // 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
-\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
-\r
     return true;\r
 }\r
 \r
@@ -331,8 +392,15 @@ MatrixClientSave(
 {\r
     FILE * f = fopen(filename, "w");\r
     \r
-    fwrite(client->deviceKey, 1, DEVICE_KEY_SIZE, f);\r
-    fwrite(client->signingKey, 1, DEVICE_KEY_SIZE, f);\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
@@ -357,8 +425,15 @@ MatrixClientLoad(
 {\r
     FILE * f = fopen(filename, "r");\r
     \r
-    fread(client->deviceKey, 1, DEVICE_KEY_SIZE, f);\r
-    fread(client->signingKey, 1, DEVICE_KEY_SIZE, f);\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
@@ -480,9 +555,14 @@ MatrixClientUploadOnetimeKeys(
 \r
 // https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload\r
 bool\r
-MatrixClientUploadDeviceKeys(\r
+MatrixClientUploadDeviceKey(\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
@@ -496,8 +576,8 @@ MatrixClientUploadDeviceKeys(
             "\"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
@@ -527,12 +607,12 @@ MatrixClientClaimOnetimeKey(
     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
-      "\"timeout\": 10000"\r
+      "\"timeout\":10000"\r
     "}",\r
     userId,\r
     deviceId);\r
@@ -567,7 +647,7 @@ MatrixClientClaimOnetimeKey(
     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
@@ -584,13 +664,13 @@ MatrixClientLoginPassword(
 \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
-            "\"password\": \"%s\","\r
-            "\"initial_device_display_name\": \"%s\""\r
+            "\"password\":\"%s\","\r
+            "\"initial_device_display_name\":\"%s\""\r
         "}",\r
         username,\r
         password,\r
@@ -604,10 +684,10 @@ MatrixClientLoginPassword(
             responseBuffer, LOGIN_RESPONSE_SIZE,\r
             false);\r
     \r
-    int responseLen = strlen(responseBuffer);\r
-    \r
     if (!result)\r
         return false;\r
+    \r
+    int responseLen = strlen(responseBuffer);\r
 \r
     mjson_get_string(responseBuffer, responseLen,\r
         "$.access_token",\r
@@ -679,8 +759,12 @@ MatrixClientSendEventEncrypted(
         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
-    const char * senderKey = client->deviceKey;\r
+    const char * senderKey = thisDeviceKey;\r
     const char * sessionId = outSession->id;\r
     const char * deviceId = client->deviceId;\r
 \r
@@ -762,6 +846,7 @@ MatrixClientShareMegolmOutSession(
 bool\r
 MatrixClientShareMegolmOutSessionTest(\r
     MatrixClient * client,\r
+    const char * userId,\r
     const char * deviceId,\r
     MatrixMegolmOutSession * session)\r
 {\r
@@ -781,7 +866,7 @@ MatrixClientShareMegolmOutSessionTest(
 \r
     // send\r
     MatrixClientSendToDevice(client,\r
-        client->userId,\r
+        userId,\r
         deviceId,\r
         eventBuffer,\r
         "m.room_key");\r
@@ -866,7 +951,7 @@ MatrixClientGetOlmSession(
     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
@@ -909,8 +994,8 @@ MatrixClientSendToDevice(
     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
@@ -943,29 +1028,36 @@ MatrixClientSendToDeviceEncrypted(
     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
+    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
-        "\"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
-        "\"keys\": {"\r
-          "\"ed25519\": \"%s\""\r
+        "\"keys\":{"\r
+          "\"ed25519\":\"%s\""\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
@@ -973,6 +1065,10 @@ MatrixClientSendToDeviceEncrypted(
         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
@@ -986,11 +1082,11 @@ MatrixClientSendToDeviceEncrypted(
         "\"device_id\":\"%s\","\r
         "\"sender_key\":\"%s\""\r
         "}",\r
-        deviceKey,\r
+        targetDeviceKey,\r
         encryptedBuffer,\r
-        0, //olmSession->type,\r
+        olm_session_has_received_message(olmSession->session),\r
         client->deviceId,\r
-        client->deviceKey);\r
+        thisDeviceKey);\r
 \r
     // send\r
     return MatrixClientSendToDevice(\r
@@ -1023,7 +1119,7 @@ MatrixClientFindDevice(
 }\r
 \r
 bool\r
-MatrixClientGetDeviceKey(\r
+MatrixClientRequestDeviceKey(\r
     MatrixClient * client,\r
     const char * deviceId,\r
     char * outDeviceKey, int outDeviceKeyCap)\r
@@ -1047,6 +1143,31 @@ MatrixClientGetDeviceKey(
     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
@@ -1079,7 +1200,7 @@ MatrixClientRequestDeviceKeys(
     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
@@ -1100,11 +1221,26 @@ MatrixClientRequestDeviceKeys(
         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
-            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
@@ -1114,3 +1250,17 @@ MatrixClientRequestDeviceKeys(
 \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

diff --git a/src/matrix.h b/src/matrix.h
index 3614b6a74c4f89c91f268d47f8fbc041e654e962..b51d0e99fc3469c612d21e09fd6c5312f7be0324 100644 (file)
--- a/src/matrix.h
+++ b/src/matrix.h
@@ -56,6 +56,7 @@
 typedef struct MatrixDevice {\r
     char deviceId[DEVICE_ID_SIZE];\r
     char deviceKey[DEVICE_KEY_SIZE];\r
+    char signingKey[SIGNING_KEY_SIZE];\r
 } MatrixDevice;\r
 \r
 \r
@@ -70,17 +71,40 @@ bool
 MatrixOlmAccountInit(\r
     MatrixOlmAccount * account);\r
 \r
+bool\r
+MatrixOlmAccountUnpickle(\r
+    MatrixOlmAccount * account,\r
+    void * pickled, int pickledLen,\r
+    const void * key, int keyLen);\r
+\r
+bool\r
+MatrixOlmAccountGetDeviceKey(\r
+    MatrixOlmAccount * account,\r
+    char * key, int keyCap);\r
+    \r
+bool\r
+MatrixOlmAccountGetSigningKey(\r
+    MatrixOlmAccount * account,\r
+    char * key, int keyCap);\r
+\r
 \r
 // Matrix Olm Session\r
 \r
 typedef struct MatrixOlmSession {\r
-    const char * deviceId;\r
+    const char * deviceId; // TODO: char[]\r
 \r
     int type;\r
     OlmSession * session;\r
     char memory[OLM_SESSION_MEMORY_SIZE];\r
 } MatrixOlmSession;\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
 bool\r
 MatrixOlmSessionTo(\r
     MatrixOlmSession * session,\r
@@ -151,8 +175,8 @@ typedef struct MatrixClient {
     MatrixDevice devices[NUM_DEVICES];\r
     int numDevices;\r
     \r
-    char deviceKey[DEVICE_KEY_SIZE];\r
-    char signingKey[DEVICE_KEY_SIZE];\r
+    // char deviceKey[DEVICE_KEY_SIZE];\r
+    // char signingKey[DEVICE_KEY_SIZE];\r
 \r
     char userId[USER_ID_SIZE];\r
     char server[SERVER_SIZE];\r
@@ -204,7 +228,7 @@ MatrixClientUploadOnetimeKeys(
     MatrixClient * client);\r
 \r
 bool\r
-MatrixClientUploadDeviceKeys(\r
+MatrixClientUploadDeviceKey(\r
     MatrixClient * client);\r
 \r
 bool\r
@@ -250,6 +274,7 @@ MatrixClientShareMegolmOutSession(
 bool\r
 MatrixClientShareMegolmOutSessionTest(\r
     MatrixClient * client,\r
+    const char * userId,\r
     const char * deviceId,\r
     MatrixMegolmOutSession * session);\r
 \r
@@ -294,21 +319,25 @@ MatrixClientSendToDeviceEncrypted(
     const char * msgType);\r
 \r
 bool\r
-MatrixClientGetDeviceKey(\r
+MatrixClientRequestDeviceKey(\r
     MatrixClient * client,\r
     const char * deviceId,\r
     char * outDeviceKey, int outDeviceKeyCap);\r
-\r
+    \r
 bool\r
-MatrixClientGetDeviceKey(\r
+MatrixClientRequestSigningKey(\r
     MatrixClient * client,\r
     const char * deviceId,\r
-    char * outDeviceKey, int outDeviceKeyCap);\r
+    char * outSigningKey, int outSigningKeyCap);\r
 \r
 bool\r
 MatrixClientRequestDeviceKeys(\r
     MatrixClient * client);\r
 \r
+bool\r
+MatrixClientDeleteDevice(\r
+    MatrixClient * client);\r
+\r
 \r
 \r
 \r
@@ -357,7 +386,8 @@ JsonEscape(
     const char * sIn, int sInLen,\r
     char * sOut, int sOutCap);\r
     \r
-bool JsonSign(\r
+bool\r
+JsonSign(\r
     MatrixClient * client,\r
     const char * sIn, int sInLen,\r
     char * sOut, int sOutCap);\r

diff --git a/src/matrix_http_mongoose.c b/src/matrix_http_mongoose.c
index a514f72b301eccef9009d466fee310228d82d024..b9b2ca3e26a37bbdd3d110e16f3c84e0f9865b74 100644 (file)
--- a/src/matrix_http_mongoose.c
+++ b/src/matrix_http_mongoose.c
@@ -132,6 +132,15 @@ MatrixHttpGet(
     else\r
         authorizationHeader[0] = '\0';\r
 \r
+    printf(\r
+        "GET %s HTTP/1.1\r\n"\r
+        "Host: %.*s\r\n"\r
+        "%s"\r
+        "\r\n",\r
+        url,\r
+        host.len, host.ptr,\r
+        authorizationHeader);\r
+\r
     mg_printf(conn->connection,\r
         "GET %s HTTP/1.1\r\n"\r
         "Host: %.*s\r\n"\r
@@ -173,6 +182,21 @@ MatrixHttpPost(
     else\r
         authorizationHeader[0] = '\0';\r
 \r
+    printf(\r
+            "POST %s HTTP/1.0\r\n"\r
+            "Host: %.*s\r\n"\r
+            "%s"\r
+            "Content-Type: application/json\r\n"\r
+            "Content-Length: %d\r\n"\r
+            "\r\n"\r
+            "%s"\r
+            "\r\n",\r
+            url,\r
+            host.len, host.ptr,\r
+            authorizationHeader,\r
+            strlen(requestBuffer),\r
+            requestBuffer);\r
+\r
     mg_printf(conn->connection,\r
             "POST %s HTTP/1.0\r\n"\r
             "Host: %.*s\r\n"\r
@@ -220,6 +244,22 @@ MatrixHttpPut(
     else\r
         authorizationHeader[0] = '\0';\r
 \r
+    \r
+    printf(\r
+            "PUT %s HTTP/1.0\r\n"\r
+            "Host: %.*s\r\n"\r
+            "%s"\r
+            "Content-Type: application/json\r\n"\r
+            "Content-Length: %d\r\n"\r
+            "\r\n"\r
+            "%s"\r
+            "\r\n",\r
+            url,\r
+            host.len, host.ptr,\r
+            authorizationHeader,\r
+            strlen(requestBuffer),\r
+            requestBuffer);\r
+\r
     mg_printf(conn->connection,\r
             "PUT %s HTTP/1.0\r\n"\r
             "Host: %.*s\r\n"\r