#define LOGIN_RESPONSE_SIZE 1024\r
#define LOGIN_URL "/_matrix/client/v3/login"\r
\r
-#define ENCRYPTED_REQUEST_SIZE 512\r
-#define ENCRYPTED_EVENT_SIZE 1024\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
\r
-#define TODEVICE_EVENT_SIZE 512\r
+#define TODEVICE_EVENT_SIZE (1024*5)\r
#define TODEVICE_URL "/_matrix/client/v3/sendToDevice/%s/%d"\r
\r
#define KEYS_QUERY_URL "/_matrix/client/v3/keys/query"\r
#define KEYS_QUERY_REQUEST_SIZE 256\r
-#define KEYS_QUERY_RESPONSE_SIZE 1024\r
+#define KEYS_QUERY_RESPONSE_SIZE (1024*10)\r
\r
-#define UPLOAD_KEYS_REQUEST_SIZE 512\r
-#define UPLOAD_KEYS_REQUEST_SIGNED_SIZE 1024\r
+#define KEYS_UPLOAD_URL "/_matrix/client/v3/keys/upload"\r
+#define KEYS_UPLOAD_REQUEST_SIZE 1024*4\r
+#define KEYS_UPLOAD_REQUEST_SIGNED_SIZE 2048*4\r
+#define KEYS_UPLOAD_RESPONSE_SIZE 2048\r
+\r
+#define KEYS_CLAIM_URL "/_matrix/client/v3/keys/claim"\r
+#define KEYS_CLAIM_REQUEST_SIZE 1024\r
+#define KEYS_CLAIM_RESPONSE_SIZE 1024\r
\r
#define JSON_QUERY_SIZE 128\r
\r
uint8_t * random,\r
int randomLen)\r
{\r
- static bool first = false;\r
+ static bool first = true;\r
if (first) { srand(time(0)); first = false; }\r
\r
for (int i = 0; i < randomLen; i++)\r
\r
bool\r
JsonEscape(\r
- char * sIn, int sInLen,\r
+ const char * sIn, int sInLen,\r
char * sOut, int sOutCap)\r
{\r
int sOutIndex = 0;\r
\r
bool JsonSign(\r
MatrixClient * client,\r
- char * sIn, int sInLen,\r
+ const char * sIn, int sInLen,\r
char * sOut, int sOutCap)\r
{\r
static char signature[OLM_SIGNATURE_SIZE];\r
signature, OLM_SIGNATURE_SIZE);\r
\r
int signatureLen = res;\r
+ \r
+ char thisSigningKey[DEVICE_KEY_SIZE];\r
+ MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
\r
static char signatureJson[JSON_SIGNATURE_SIZE];\r
int signatureJsonLen =\r
"}"\r
"}",\r
client->userId,\r
- client->deviceId,\r
+ "1",\r
signatureLen, signature);\r
\r
struct mjson_fixedbuf result = { sOut, sOutCap, 0 };\r
return res != olm_error();\r
}\r
\r
-// TODO: in/outbound sessions\r
bool\r
-MatrixOlmSessionInit(\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
- const char * deviceId)\r
+ OlmAccount * olmAccount,\r
+ const char * deviceId,\r
+ const char * deviceKey,\r
+ const char * deviceOnetimeKey)\r
{\r
memset(session, 0, sizeof(MatrixOlmSession));\r
\r
- static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];\r
- Randomize(random, MEGOLM_INIT_RANDOM_SIZE);\r
-\r
session->deviceId = deviceId;\r
\r
session->session =\r
olm_session(session->memory);\r
\r
+ static uint8_t random[OLM_OUTBOUND_SESSION_RANDOM_SIZE];\r
+ Randomize(random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);\r
+\r
+ size_t res =\r
+ olm_create_outbound_session(session->session,\r
+ olmAccount,\r
+ deviceKey, strlen(deviceKey),\r
+ deviceOnetimeKey, strlen(deviceOnetimeKey),\r
+ random, OLM_OUTBOUND_SESSION_RANDOM_SIZE);\r
+ \r
+ if (res == olm_error()) {\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
static uint8_t random[MEGOLM_INIT_RANDOM_SIZE];\r
Randomize(random, MEGOLM_INIT_RANDOM_SIZE);\r
\r
- session->roomId = roomId;\r
+ strncpy(session->roomId, roomId, ROOM_ID_SIZE);\r
\r
session->session =\r
olm_outbound_group_session(session->memory);\r
return res != olm_error();\r
}\r
\r
+bool\r
+MatrixMegolmOutSessionSave(\r
+ MatrixMegolmOutSession * session,\r
+ const char * filename,\r
+ const char * key)\r
+{\r
+ FILE * f = fopen(filename, "w");\r
+\r
+ size_t roomIdLen = strlen(session->roomId);\r
+ fwrite(&roomIdLen, sizeof(size_t), 1, f);\r
+ fwrite(session->roomId, 1, roomIdLen, f);\r
+\r
+ size_t pickleBufferLen =\r
+ olm_pickle_outbound_group_session_length(\r
+ session->session);\r
+ void * pickleBuffer = malloc(pickleBufferLen);\r
+\r
+ olm_pickle_outbound_group_session(\r
+ session->session,\r
+ key, strlen(key),\r
+ pickleBuffer, pickleBufferLen);\r
+ \r
+ fwrite(&pickleBufferLen, sizeof(size_t), 1, f);\r
+ fwrite(pickleBuffer, 1, pickleBufferLen, f);\r
+ free(pickleBuffer);\r
+\r
+ fclose(f);\r
+\r
+ return true;\r
+}\r
+\r
+bool\r
+MatrixMegolmOutSessionLoad(\r
+ MatrixMegolmOutSession * session,\r
+ const char * filename,\r
+ const char * key)\r
+{\r
+ FILE * f = fopen(filename, "r");\r
+\r
+ size_t roomIdLen;\r
+ fread(&roomIdLen, sizeof(size_t), 1, f);\r
+ fread(session->roomId, 1, roomIdLen, f);\r
+ for (int i = roomIdLen; i < ROOM_ID_SIZE; i++)\r
+ session->roomId[i] = '\0';\r
+\r
+ size_t pickleBufferLen;\r
+ fread(&pickleBufferLen, sizeof(size_t), 1, f);\r
+\r
+ void * pickleBuffer = malloc(pickleBufferLen);\r
+ fread(pickleBuffer, 1, pickleBufferLen, f);\r
+\r
+ olm_unpickle_outbound_group_session(\r
+ session->session,\r
+ key, strlen(key),\r
+ pickleBuffer, pickleBufferLen);\r
+ \r
+ free(pickleBuffer);\r
+\r
+ olm_outbound_group_session_id(session->session, (uint8_t *)session->id, MEGOLM_SESSION_ID_SIZE);\r
+ olm_outbound_group_session_key(session->session, (uint8_t *)session->key, MEGOLM_SESSION_KEY_SIZE);\r
+\r
+ fclose(f);\r
+\r
+ return true;\r
+}\r
+\r
\r
\r
bool\r
// init olm account\r
MatrixOlmAccountInit(&client->olmAccount);\r
\r
- // set device key\r
- static char deviceKeysJson[OLM_IDENTITY_KEYS_JSON_SIZE];\r
- size_t res =\r
- olm_account_identity_keys(\r
- client->olmAccount.account,\r
- deviceKeysJson,\r
- OLM_IDENTITY_KEYS_JSON_SIZE);\r
+ return true;\r
+}\r
\r
- mjson_get_string(deviceKeysJson, res,\r
- "$.curve25519",\r
- client->deviceKey, DEVICE_KEY_SIZE);\r
- mjson_get_string(deviceKeysJson, res,\r
- "$.ed25519",\r
- client->signingKey, SIGNING_KEY_SIZE);\r
+bool\r
+MatrixClientSave(\r
+ MatrixClient * client,\r
+ const char * filename)\r
+{\r
+ FILE * f = fopen(filename, "w");\r
+ \r
+ \r
+ char thisDeviceKey[DEVICE_KEY_SIZE];\r
+ MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+ char thisSigningKey[DEVICE_KEY_SIZE];\r
+ MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
+\r
+\r
+ fwrite(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);\r
+ fwrite(thisSigningKey, 1, DEVICE_KEY_SIZE, f);\r
+ fwrite(client->userId, 1, USER_ID_SIZE, f);\r
+ fwrite(client->server, 1, SERVER_SIZE, f);\r
+ fwrite(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);\r
+ fwrite(client->deviceId, 1, DEVICE_ID_SIZE, f);\r
+ fwrite(client->expireMs, 1, EXPIRE_MS_SIZE, f);\r
+ fwrite(client->refreshToken, 1, REFRESH_TOKEN_SIZE, f);\r
+\r
+ fwrite(&client->numDevices, sizeof(int), 1, f);\r
+ for (int i = 0; i < client->numDevices; i++) {\r
+ fwrite(client->devices[i].deviceId, 1, DEVICE_ID_SIZE, f);\r
+ fwrite(client->devices[i].deviceKey, 1, DEVICE_KEY_SIZE, f);\r
+ }\r
\r
+ fclose(f);\r
return true;\r
}\r
\r
bool\r
-MatrixClientSetAccessToken(\r
+MatrixClientLoad(\r
MatrixClient * client,\r
- const char * accessToken)\r
+ const char * filename)\r
{\r
- int accessTokenLen = strlen(accessToken);\r
+ FILE * f = fopen(filename, "r");\r
+ \r
+ \r
+ char thisDeviceKey[DEVICE_KEY_SIZE];\r
+ MatrixOlmAccountGetDeviceKey(&client->olmAccount, thisDeviceKey, DEVICE_KEY_SIZE);\r
+ char thisSigningKey[DEVICE_KEY_SIZE];\r
+ MatrixOlmAccountGetSigningKey(&client->olmAccount, thisSigningKey, DEVICE_KEY_SIZE);\r
+\r
+\r
+ fread(thisDeviceKey, 1, DEVICE_KEY_SIZE, f);\r
+ fread(thisSigningKey, 1, DEVICE_KEY_SIZE, f);\r
+ fread(client->userId, 1, USER_ID_SIZE, f);\r
+ fread(client->server, 1, SERVER_SIZE, f);\r
+ fread(client->accessToken, 1, ACCESS_TOKEN_SIZE, f);\r
+ fread(client->deviceId, 1, DEVICE_ID_SIZE, f);\r
+ fread(client->expireMs, 1, EXPIRE_MS_SIZE, f);\r
+ fread(client->refreshToken, 1, REFRESH_TOKEN_SIZE, f);\r
+\r
+ fread(&client->numDevices, sizeof(int), 1, f);\r
+ for (int i = 0; i < client->numDevices; i++) {\r
+ fread(client->devices[i].deviceId, 1, DEVICE_ID_SIZE, f);\r
+ fread(client->devices[i].deviceKey, 1, DEVICE_KEY_SIZE, f);\r
+ }\r
\r
- if (accessTokenLen > ACCESS_TOKEN_SIZE - 1)\r
- return false;\r
+ fclose(f);\r
+ return true;\r
+}\r
\r
- for (int i = 0; i < accessTokenLen; i++)\r
+bool\r
+MatrixClientSetAccessToken(\r
+ MatrixClient * client,\r
+ const char * accessToken)\r
+{\r
+ for (int i = 0; i < ACCESS_TOKEN_SIZE-1; i++)\r
client->accessToken[i] = accessToken[i];\r
+ client->accessToken[ACCESS_TOKEN_SIZE-1] = '\0';\r
\r
return true;\r
}\r
MatrixClient * client,\r
const char * deviceId)\r
{\r
- int deviceIdLen = strlen(deviceId);\r
-\r
- if (deviceIdLen > DEVICE_ID_SIZE - 1)\r
- return false;\r
-\r
- for (int i = 0; i < deviceIdLen; i++)\r
+ for (int i = 0; i < DEVICE_ID_SIZE-1; i++)\r
client->deviceId[i] = deviceId[i];\r
+ client->deviceId[DEVICE_ID_SIZE-1] = '\0';\r
\r
return true;\r
}\r
MatrixClient * client,\r
const char * userId)\r
{\r
- int userIdLen = strlen(userId);\r
-\r
- if (userIdLen > USER_ID_SIZE - 1)\r
- return false;\r
-\r
- for (int i = 0; i < userIdLen; i++)\r
+ for (int i = 0; i < USER_ID_SIZE-1; i++)\r
client->userId[i] = userId[i];\r
+ client->userId[USER_ID_SIZE-1] = '\0';\r
\r
return true;\r
}\r
return res != olm_error();\r
}\r
\r
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysupload\r
bool\r
MatrixClientUploadOnetimeKeys(\r
MatrixClient * client)\r
{\r
- static char requestBuffer[UPLOAD_KEYS_REQUEST_SIZE];\r
+ static char requestBuffer[KEYS_UPLOAD_REQUEST_SIZE];\r
\r
- mjson_snprintf(requestBuffer, UPLOAD_KEYS_REQUEST_SIZE,\r
+ mjson_snprintf(requestBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
"{\"one_time_keys\":{");\r
\r
static char onetimeKeysBuffer[1024];\r
keyJson, JSON_ONETIME_KEY_SIZE,\r
keyJsonSigned, JSON_ONETIME_KEY_SIGNED_SIZE);\r
\r
- mjson_snprintf(requestBuffer+strlen(requestBuffer), UPLOAD_KEYS_REQUEST_SIZE-strlen(requestBuffer),\r
+ mjson_snprintf(requestBuffer+strlen(requestBuffer), KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
"\"signed_curve25519:%.*s\":%s,",\r
klen-2, keys + koff+1,\r
keyJsonSigned);\r
}\r
\r
- mjson_snprintf(requestBuffer+strlen(requestBuffer), UPLOAD_KEYS_REQUEST_SIZE-strlen(requestBuffer),\r
+ mjson_snprintf(requestBuffer+strlen(requestBuffer)-1, KEYS_UPLOAD_REQUEST_SIZE-strlen(requestBuffer),\r
"}}");\r
\r
- printf("%s\n", requestBuffer);\r
+ static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
+ MatrixHttpPost(client,\r
+ KEYS_UPLOAD_URL,\r
+ requestBuffer,\r
+ responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
+ true);\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
- static char deviceKeysBuffer[UPLOAD_KEYS_REQUEST_SIZE];\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, UPLOAD_KEYS_REQUEST_SIZE,\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
"\"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[UPLOAD_KEYS_REQUEST_SIGNED_SIZE];\r
+ static char deviceKeysSignedBuffer[KEYS_UPLOAD_REQUEST_SIGNED_SIZE];\r
JsonSign(client,\r
- deviceKeysBuffer, UPLOAD_KEYS_REQUEST_SIZE,\r
- deviceKeysSignedBuffer, UPLOAD_KEYS_REQUEST_SIZE);\r
+ deviceKeysBuffer, KEYS_UPLOAD_REQUEST_SIZE,\r
+ deviceKeysSignedBuffer, KEYS_UPLOAD_REQUEST_SIZE);\r
\r
- printf("%s\n", deviceKeysSignedBuffer);\r
+\r
+ static char responseBuffer[KEYS_UPLOAD_RESPONSE_SIZE];\r
+ MatrixHttpPost(client,\r
+ KEYS_UPLOAD_URL,\r
+ deviceKeysSignedBuffer,\r
+ responseBuffer, KEYS_UPLOAD_RESPONSE_SIZE,\r
+ true);\r
\r
return true;\r
}\r
\r
+// https://spec.matrix.org/v1.7/client-server-api/#post_matrixclientv3keysclaim\r
+bool\r
+MatrixClientClaimOnetimeKey(\r
+ MatrixClient * client,\r
+ const char * userId,\r
+ const char * deviceId,\r
+ char * outOnetimeKey, int outOnetimeKeyCap)\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
+ "}"\r
+ "},"\r
+ "\"timeout\":10000"\r
+ "}",\r
+ userId,\r
+ deviceId);\r
+\r
+ static char responseBuffer[KEYS_CLAIM_RESPONSE_SIZE];\r
+ MatrixHttpPost(client,\r
+ KEYS_CLAIM_URL,\r
+ requestBuffer,\r
+ responseBuffer, KEYS_CLAIM_RESPONSE_SIZE,\r
+ true);\r
+ \r
+ char userIdEscaped[USER_ID_SIZE];\r
+ JsonEscape(userId, strlen(userId),\r
+ userIdEscaped, USER_ID_SIZE);\r
+ \r
+ static char query[JSON_QUERY_SIZE];\r
+ snprintf(query, JSON_QUERY_SIZE,\r
+ "$.one_time_keys.%s.%s",\r
+ userIdEscaped,\r
+ deviceId);\r
+ \r
+ const char * keyObject;\r
+ int keyObjectSize;\r
+ mjson_find(responseBuffer, strlen(responseBuffer),\r
+ query,\r
+ &keyObject, &keyObjectSize);\r
+ \r
+ int koff, klen, voff, vlen, vtype;\r
+ mjson_next(keyObject, keyObjectSize, 0,\r
+ &koff, &klen, &voff, &vlen, &vtype);\r
+ \r
+ mjson_get_string(keyObject + voff, vlen,\r
+ "$.key", outOnetimeKey, outOnetimeKeyCap);\r
+ \r
+ // TODO:verify signature\r
+ \r
+ return true;\r
+}\r
+\r
// https://spec.matrix.org/v1.6/client-server-api/#post_matrixclientv3login\r
bool\r
MatrixClientLoginPassword(\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
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
sprintf(encryptedEventBuffer,\r
"{"\r
"\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
- "\"sender_key\":\"%s\","\r
"\"ciphertext\":\"%s\","\r
- "\"session_id\":\"%s\","\r
- "\"device_id\":\"%s\""\r
+ "\"device_id\":\"%s\","\r
+ "\"sender_key\":\"%s\","\r
+ "\"session_id\":\"%s\""\r
"}",\r
- senderKey,\r
encryptedBuffer,\r
- sessionId,\r
- deviceId);\r
+ deviceId,\r
+ senderKey,\r
+ sessionId);\r
\r
// send\r
return MatrixClientSendEvent(client,\r
bool\r
MatrixClientShareMegolmOutSession(\r
MatrixClient * client,\r
+ const char * userId,\r
const char * deviceId,\r
MatrixMegolmOutSession * session)\r
{\r
// generate room key event\r
- char eventBuffer[KEY_SHARE_EVENT_LEN];\r
+ static char eventBuffer[KEY_SHARE_EVENT_LEN];\r
sprintf(eventBuffer,\r
"{"\r
"\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
session->key\r
);\r
\r
- // get olm session\r
- MatrixOlmSession * olmSession;\r
- MatrixClientGetOlmSession(client, deviceId, &olmSession);\r
+ // // get olm session\r
+ // MatrixOlmSession * olmSession;\r
+ // MatrixClientGetOlmSession(client, userId, deviceId, &olmSession);\r
\r
- // encrypt\r
- char encryptedBuffer[KEY_SHARE_EVENT_LEN];\r
- MatrixOlmSessionEncrypt(olmSession,\r
- eventBuffer,\r
- encryptedBuffer, KEY_SHARE_EVENT_LEN);\r
+ // // encrypt\r
+ // char encryptedBuffer[KEY_SHARE_EVENT_LEN];\r
+ // MatrixOlmSessionEncrypt(olmSession,\r
+ // eventBuffer,\r
+ // encryptedBuffer, KEY_SHARE_EVENT_LEN);\r
\r
// send\r
MatrixClientSendToDeviceEncrypted(client,\r
- client->userId,\r
+ userId,\r
deviceId,\r
- encryptedBuffer,\r
+ eventBuffer,\r
"m.room_key");\r
\r
return true;\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
}\r
}\r
\r
+ if (MatrixClientInitMegolmOutSession(client, roomId)) {\r
+ *outSession = &client->megolmOutSessions[client->numMegolmOutSessions-1];\r
+ return true;\r
+ }\r
+\r
+ return false;\r
+}\r
+\r
+bool\r
+MatrixClientInitMegolmOutSession(\r
+ MatrixClient * client,\r
+ const char * roomId)\r
+{\r
if (client->numMegolmOutSessions < NUM_MEGOLM_SESSIONS)\r
{\r
MatrixMegolmOutSessionInit(\r
&client->megolmOutSessions[client->numMegolmOutSessions],\r
roomId);\r
-\r
- *outSession = &client->megolmOutSessions[client->numMegolmOutSessions];\r
\r
client->numMegolmOutSessions++;\r
\r
return true;\r
}\r
-\r
return false;\r
}\r
\r
bool\r
MatrixClientGetOlmSession(\r
MatrixClient * client,\r
+ const char * userId,\r
const char * deviceId,\r
MatrixOlmSession ** outSession)\r
{\r
\r
if (client->numOlmSessions < NUM_OLM_SESSIONS)\r
{\r
- MatrixOlmSessionInit(\r
+ static char deviceKey[DEVICE_KEY_SIZE];\r
+ MatrixClientRequestDeviceKey(client,\r
+ deviceId,\r
+ deviceKey, DEVICE_KEY_SIZE);\r
+\r
+ char onetimeKey[ONETIME_KEY_SIZE];\r
+ MatrixClientClaimOnetimeKey(client,\r
+ userId,\r
+ deviceId,\r
+ onetimeKey, ONETIME_KEY_SIZE);\r
+\r
+ MatrixOlmSessionTo(\r
&client->olmSessions[client->numOlmSessions],\r
- deviceId);\r
+ client->olmAccount.account,\r
+ deviceId,\r
+ deviceKey,\r
+ onetimeKey);\r
\r
*outSession = &client->olmSessions[client->numOlmSessions];\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
{\r
// get olm session\r
MatrixOlmSession * olmSession;\r
- MatrixClientGetOlmSession(client, deviceId, &olmSession);\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
- const char * senderKey = client->deviceKey;\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
- "\"algorithm\":\"m.megolm.v1.aes-sha2\","\r
- "\"sender_key\":\"%s\","\r
+ "\"algorithm\":\"m.olm.v1.curve25519-aes-sha2\","\r
"\"ciphertext\":{"\r
"\"%s\":{"\r
"\"body\":\"%s\","\r
- "\"type\":\"%d\""\r
+ "\"type\":%d"\r
"}"\r
- "}"\r
+ "},"\r
+ "\"device_id\":\"%s\","\r
+ "\"sender_key\":\"%s\""\r
"}",\r
- senderKey,\r
- deviceKey,\r
+ targetDeviceKey,\r
encryptedBuffer,\r
- olmSession->type);\r
+ olm_session_has_received_message(olmSession->session),\r
+ client->deviceId,\r
+ thisDeviceKey);\r
\r
// send\r
return MatrixClientSendToDevice(\r
}\r
\r
bool\r
-MatrixClientGetDeviceKey(\r
+MatrixClientRequestDeviceKey(\r
MatrixClient * client,\r
const char * deviceId,\r
char * outDeviceKey, int outDeviceKeyCap)\r
{\r
+ MatrixDevice * device;\r
+ \r
+ if (MatrixClientFindDevice(client, deviceId, &device))\r
+ {\r
+ strncpy(outDeviceKey, device->deviceKey, outDeviceKeyCap);\r
+ return true;\r
+ }\r
+\r
MatrixClientRequestDeviceKeys(client);\r
\r
- MatrixDevice * device;\r
if (MatrixClientFindDevice(client, deviceId, &device))\r
{\r
strncpy(outDeviceKey, device->deviceKey, 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
MatrixClient * client)\r
{\r
- char userIdEscaped[USER_ID_SIZE];\r
+ static char userIdEscaped[USER_ID_SIZE];\r
JsonEscape(client->userId, strlen(client->userId),\r
userIdEscaped, USER_ID_SIZE);\r
\r
- char request[KEYS_QUERY_REQUEST_SIZE];\r
+ static char request[KEYS_QUERY_REQUEST_SIZE];\r
snprintf(request, KEYS_QUERY_REQUEST_SIZE,\r
- "{\"device_keys\":{\"%s\":[]}}", userIdEscaped);\r
+ "{\"device_keys\":{\"%s\":[]}}", client->userId);\r
\r
- char responseBuffer[KEYS_QUERY_RESPONSE_SIZE];\r
+ static char responseBuffer[KEYS_QUERY_RESPONSE_SIZE];\r
bool requestResult = MatrixHttpPost(client,\r
KEYS_QUERY_URL,\r
request,\r
responseBuffer, KEYS_QUERY_RESPONSE_SIZE,\r
true);\r
\r
- if (requestResult)\r
- {\r
- // query for retrieving device keys for user id\r
- char query[JSON_QUERY_SIZE];\r
- snprintf(query, JSON_QUERY_SIZE,\r
- "$.device_keys.%s", userIdEscaped);\r
- \r
- const char * s;\r
- int slen;\r
- mjson_find(responseBuffer, strlen(responseBuffer),\r
- query, &s, &slen);\r
+ if (! requestResult)\r
+ return false;\r
\r
- // loop over keys\r
- \r
- int koff, klen, voff, vlen, vtype, off;\r
- for (off = 0; (off = mjson_next(s, slen, off, &koff, &klen,\r
- &voff, &vlen, &vtype)) != 0; ) {\r
- const char * key = s + koff;\r
- const char * val = s + voff;\r
-\r
- // set device id, "key" is the JSON key\r
- MatrixDevice d;\r
- strncpy(d.deviceId, key, klen);\r
-\r
- // look for device key in value\r
- char deviceKeyQuery[JSON_QUERY_SIZE];\r
- snprintf(deviceKeyQuery, JSON_QUERY_SIZE,\r
- "$.keys.curve25519:%.*s", klen, key);\r
- mjson_get_string(val, vlen,\r
- deviceKeyQuery, d.deviceKey, DEVICE_KEY_SIZE);\r
-\r
- // add device\r
- if (client->numDevices < NUM_DEVICES)\r
- {\r
+ // query for retrieving device keys for user id\r
+ static char query[JSON_QUERY_SIZE];\r
+ snprintf(query, JSON_QUERY_SIZE,\r
+ "$.device_keys.%s", userIdEscaped);\r
+ \r
+ const char * s;\r
+ int slen;\r
+ mjson_find(responseBuffer, strlen(responseBuffer),\r
+ query, &s, &slen);\r
+ \r
+ // loop over keys\r
+ \r
+ int koff, klen, voff, vlen, vtype, off = 0;\r
+ for (off = 0; (off = mjson_next(s, slen, off, &koff, &klen,\r
+ &voff, &vlen, &vtype)) != 0; ) {\r
+ const char * key = s + koff;\r
+ const char * val = s + voff;\r
+\r
+ // set device id, "key" is the JSON key\r
+ MatrixDevice d;\r
+ snprintf(d.deviceId, DEVICE_ID_SIZE,\r
+ "%.*s", klen-2, key+1);\r
+\r
+ // look for device key in value\r
+ static char deviceKeyQuery[JSON_QUERY_SIZE];\r
+ snprintf(deviceKeyQuery, JSON_QUERY_SIZE,\r
+ "$.keys.curve25519:%s", d.deviceId);\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
+ 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
- else\r
- {\r
- return false;\r
- }\r
}\r
-\r
- return true;\r
- }\r
- else\r
- {\r
- return false;\r
+ else\r
+ {\r
+ return false;\r
+ }\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