\r
#define ENCRYPTED_REQUEST_SIZE (1024*5)\r
#define ENCRYPTED_EVENT_SIZE (1024*10)\r
-#define ROOMEVENT_REQUEST_SIZE 256\r
-#define ROOMEVENT_RESPONSE_SIZE 1024\r
-#define ROOMEVENT_URL "/_matrix/client/v3/rooms/%s/send/%s/%d"\r
+#define ROOM_SEND_REQUEST_SIZE 256\r
+#define ROOM_SEND_RESPONSE_SIZE 1024\r
+#define ROOM_SEND_URL "/_matrix/client/v3/rooms/%s/send/%s/%d"\r
+\r
+#define ROOMKEY_REQUEST_SIZE (1024*4)\r
\r
#define TODEVICE_EVENT_SIZE (1024*5)\r
#define TODEVICE_URL "/_matrix/client/v3/sendToDevice/%s/%d"\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
signature, OLM_SIGNATURE_SIZE);\r
\r
int signatureLen = res;\r
+ \r
+ static char thisSigningKey[SIGNING_KEY_SIZE];\r
+ MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, SIGNING_KEY_SIZE);\r
\r
static char signatureJson[JSON_SIGNATURE_SIZE];\r
int signatureJsonLen =\r
"}"\r
"}",\r
client->userId,\r
+ //"1",\r
client->deviceId,\r
signatureLen, signature);\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
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
return res != olm_error();\r
}\r
\r
+bool\r
+MatrixOlmSessionDecrypt(\r
+ MatrixOlmSession * session,\r
+ size_t messageType,\r
+ char * encrypted,\r
+ char * outBuffer, int outBufferCap)\r
+{\r
+ static uint8_t random[OLM_ENCRYPT_RANDOM_SIZE];\r
+ Randomize(random, OLM_ENCRYPT_RANDOM_SIZE);\r
+\r
+ size_t res =\r
+ olm_decrypt(session->session,\r
+ messageType,\r
+ encrypted, strlen(encrypted),\r
+ outBuffer, outBufferCap);\r
+ \r
+ if (res != olm_error() && res < outBufferCap)\r
+ outBuffer[outBufferCap] = '\0';\r
+\r
+ return res != olm_error();\r
+}\r
+\r
// https://matrix.org/docs/guides/end-to-end-encryption-implementation-guide#starting-a-megolm-session\r
bool\r
MatrixMegolmOutSessionInit(\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
-\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
{\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
{\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
static char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
\r
mjson_snprintf(requestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
- "{\"one_time_keys\":{");\r
+ "{");\r
\r
static char onetimeKeysBuffer[1024];\r
olm_account_one_time_keys(client->olmAccount.account,\r
while ((off = mjson_next(keys, keysLen, off, &koff, &klen, &voff, &vlen, &vtype)) != 0) {\r
static char keyJson[JSON_ONETIME_KEY_SIZE];\r
\r
- snprintf(keyJson, JSON_ONETIME_KEY_SIZE,\r
- "{\"key\":\"%.*s\"}",\r
- vlen-2, keys + voff+1);\r
+ int keyJsonLen =\r
+ snprintf(keyJson, JSON_ONETIME_KEY_SIZE,\r
+ "{\"key\":\"%.*s\"}",\r
+ vlen-2, keys + voff+1);\r
\r
static char keyJsonSigned[JSON_ONETIME_KEY_SIGNED_SIZE];\r
\r
JsonSign(client,\r
- keyJson, JSON_ONETIME_KEY_SIZE,\r
+ keyJson, keyJsonLen,\r
keyJsonSigned, JSON_ONETIME_KEY_SIGNED_SIZE);\r
\r
mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
keyJsonSigned);\r
}\r
\r
- mjson_snprintf(requestBuffer+strlen(requestBuffer)-1, KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
- "}}");\r
+ if (requestBuffer[strlen(requestBuffer)-1] == ',')\r
+ requestBuffer[strlen(requestBuffer)-1] = '\0';\r
+\r
+ mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
+ "}");\r
+ \r
+ // static char onetimeKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
+ // JsonSign(client,\r
+ // requestBuffer, strlen(requestBuffer),\r
+ // onetimeKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
+ \r
+ // static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
+ // snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
+ // "{\"one_time_keys\":%s}", onetimeKeysSignedBuffer);\r
+ static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
+ snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
+ "{\"one_time_keys\":%s}", requestBuffer);\r
\r
static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
MatrixHttpPost(client,\r
KEYS_UPLOAD_URL,\r
- requestBuffer,\r
+ finalEvent,\r
responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
true);\r
\r
+ printf("%s\n", responseBuffer);\r
+\r
return true;\r
}\r
\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
- "{\"device_keys\":{"\r
- "\"algorithms\":[\"m.olm.v1.curve25519-aes-sha2\",\"m.megolm.v1.aes-sha2\"],"\r
- "\"device_id\":\"%s\","\r
- "\"keys\":{"\r
- "\"curve25519:%s\":\"%s\","\r
- "\"ed25519:%s\":\"%s\""\r
- "},"\r
- "\"user_id\":\"%s\""\r
- "}}",\r
- client->deviceId,\r
- client->deviceId, client->deviceKey,\r
- client->deviceId, client->signingKey,\r
- client->userId);\r
+ int deviceKeysBufferLen =\r
+ mjson_snprintf(deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
+ "{"\r
+ "\"algorithms\":[\"m.olm.v1.curve25519-aes-sha2\",\"m.megolm.v1.aes-sha2\"],"\r
+ "\"device_id\":\"%s\","\r
+ "\"keys\":{"\r
+ "\"curve25519:%s\":\"%s\","\r
+ "\"ed25519:%s\":\"%s\""\r
+ "},"\r
+ "\"user_id\":\"%s\""\r
+ "}",\r
+ client->deviceId,\r
+ client->deviceId, thisDeviceKey,\r
+ client->deviceId, thisSigningKey,\r
+ client->userId);\r
\r
static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
JsonSign(client,\r
- deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
+ deviceKeysBuffer, deviceKeysBufferLen,\r
deviceKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
-\r
+ \r
+ static char finalEvent[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
+ snprintf(finalEvent, KEYS_UPLOAD_REQUEST_SIGNED_SIZE,\r
+ "{\"device_keys\":%s}", deviceKeysSignedBuffer);\r
\r
static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
MatrixHttpPost(client,\r
KEYS_UPLOAD_URL,\r
- deviceKeysSignedBuffer,\r
+ finalEvent,\r
responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
true);\r
+ \r
+ printf("%s\n", responseBuffer);\r
\r
return true;\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
- "\"timeout\": 10000"\r
+ "\"timeout\":10000"\r
"}",\r
userId,\r
deviceId);\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
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
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
{ \r
static char requestUrl[MAX_URL_LEN];\r
sprintf(requestUrl,\r
- ROOMEVENT_URL, roomId, msgType, (int)time(NULL));\r
+ ROOM_SEND_URL, roomId, msgType, (int)time(NULL));\r
\r
- static char responseBuffer[ROOMEVENT_RESPONSE_SIZE];\r
+ static char responseBuffer[ROOM_SEND_RESPONSE_SIZE];\r
bool result =\r
MatrixHttpPut(client,\r
requestUrl,\r
msgBody,\r
- responseBuffer, ROOMEVENT_RESPONSE_SIZE,\r
+ responseBuffer, ROOM_SEND_RESPONSE_SIZE,\r
true);\r
\r
return result;\r
const char * msgBody)\r
{\r
// event json\r
- static char requestBuffer[ROOMEVENT_REQUEST_SIZE];\r
+ static char requestBuffer[ROOM_SEND_REQUEST_SIZE];\r
sprintf(requestBuffer,\r
"{"\r
"\"type\":\"%s\","\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
- const char * senderKey = client->deviceKey;\r
+ const char * senderKey = thisDeviceKey;\r
const char * sessionId = outSession->id;\r
const char * deviceId = client->deviceId;\r
\r
bool\r
MatrixClientSync(\r
MatrixClient * client,\r
- char * outSyncBuffer, int outSyncCap)\r
+ char * outSyncBuffer, int outSyncCap,\r
+ const char * nextBatch)\r
{\r
+ // filter={\"event_fields\":[\"to_device\"]}\r
+ static char url[MAX_URL_LEN];\r
+ snprintf(url, MAX_URL_LEN,\r
+ "/_matrix/client/v3/sync%s",\r
+ strlen(nextBatch) > 0 ? "?since=" : "");\r
+ \r
+ int index = strlen(url);\r
+\r
+ for (int i = 0; i < strlen(nextBatch); i++) {\r
+ char c = nextBatch[i];\r
+\r
+ if (c == '~') {\r
+ url[index++] = '%';\r
+ url[index++] = '7';\r
+ url[index++] = 'E';\r
+ }\r
+ else {\r
+ url[index++] = c;\r
+ }\r
+ }\r
+ url[index] = '\0';\r
+\r
return\r
MatrixHttpGet(client,\r
- "/_matrix/client/v3/sync",\r
+ url,\r
outSyncBuffer, outSyncCap,\r
true);\r
}\r
\r
+// https://spec.matrix.org/v1.7/client-server-api/#get_matrixclientv3roomsroomideventeventid\r
+bool\r
+MatrixClientGetRoomEvent(\r
+ MatrixClient * client,\r
+ const char * roomId,\r
+ const char * eventId,\r
+ char * outEvent, int outEventCap)\r
+{\r
+ static char url[MAX_URL_LEN];\r
+ snprintf(url, MAX_URL_LEN,\r
+ "/_matrix/client/v3/rooms/%s/event/%s",\r
+ roomId,\r
+ eventId);\r
+\r
+ return\r
+ MatrixHttpGet(client,\r
+ url,\r
+ outEvent, outEventCap,\r
+ true);\r
+}\r
+\r
bool\r
MatrixClientShareMegolmOutSession(\r
MatrixClient * client,\r
bool\r
MatrixClientShareMegolmOutSessionTest(\r
MatrixClient * client,\r
+ const char * userId,\r
const char * deviceId,\r
MatrixMegolmOutSession * session)\r
{\r
\r
// send\r
MatrixClientSendToDevice(client,\r
- client->userId,\r
+ userId,\r
deviceId,\r
eventBuffer,\r
"m.room_key");\r
return false;\r
}\r
\r
+bool\r
+MatrixClientRequestMegolmInSession(\r
+ MatrixClient * client,\r
+ const char * roomId,\r
+ const char * sessionId,\r
+ const char * senderKey,\r
+ const char * userId,\r
+ const char * deviceId,\r
+ MatrixMegolmInSession * outMegolmInSession)\r
+{\r
+ // TODO: cancel requests\r
+ MatrixClientSendDummy(client, userId, deviceId);\r
+\r
+ static char event[ROOMKEY_REQUEST_SIZE];\r
+ snprintf(event, ROOMKEY_REQUEST_SIZE,\r
+ "{"\r
+ "\"action\":\"request\","\r
+ "\"body\":{"\r
+ "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
+ "\"room_id\":\"%s\","\r
+ "\"sender_key\":\"%s\","\r
+ "\"session_id\":\"%s\""\r
+ "},"\r
+ "\"request_id\":\"%d\","\r
+ "\"requesting_device_id\":\"%s\""\r
+ "}",\r
+ roomId,\r
+ senderKey,\r
+ sessionId,\r
+ time(NULL),\r
+ client->deviceId);\r
+\r
+ \r
+ MatrixClientSendToDevice(client,\r
+ userId,\r
+ deviceId,\r
+ event,\r
+ "m.room_key_request");\r
+\r
+ return true;\r
+}\r
+\r
bool\r
MatrixClientGetOlmSession(\r
MatrixClient * client,\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
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
deviceId,\r
message);\r
\r
- static char responseBuffer[ROOMEVENT_RESPONSE_SIZE];\r
+ static char responseBuffer[ROOM_SEND_RESPONSE_SIZE];\r
bool result =\r
MatrixHttpPut(client,\r
requestUrl,\r
eventBuffer,\r
- responseBuffer, ROOMEVENT_RESPONSE_SIZE,\r
+ responseBuffer, ROOM_SEND_RESPONSE_SIZE,\r
true);\r
\r
+ printf("%s\n", responseBuffer);\r
+ \r
return result;\r
}\r
\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
+ 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
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
"\"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
"m.room.encrypted");\r
}\r
\r
+bool\r
+MatrixClientSendDummy(\r
+ MatrixClient * client,\r
+ const char * userId,\r
+ const char * deviceId)\r
+{\r
+ return MatrixClientSendToDeviceEncrypted(\r
+ client,\r
+ userId,\r
+ deviceId,\r
+ "{}",\r
+ "m.dummy");\r
+}\r
+\r
bool\r
MatrixClientFindDevice(\r
MatrixClient * client,\r
}\r
\r
bool\r
-MatrixClientGetDeviceKey(\r
+MatrixClientRequestDeviceKey(\r
MatrixClient * client,\r
const char * deviceId,\r
char * outDeviceKey, int outDeviceKeyCap)\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
if (! requestResult)\r
return false;\r
\r
+ printf("keys:\n%s\n", responseBuffer);\r
+\r
// query for retrieving device keys for user id\r
static char query[JSON_QUERY_SIZE];\r
snprintf(query, JSON_QUERY_SIZE,\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
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
\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
projects / matrix_esp_thesis / blobdiff