From 760426d17bc296232b9fedf7e114cb699e2697ae Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 13 Nov 2023 21:09:43 +0100 Subject: [PATCH] fix examples --- examples/Cli.c | 19 ++++++++++--------- examples/Decrypt.c | 19 +++++++------------ examples/Keys.c | 9 +++++---- examples/Login.c | 9 ++++----- examples/ReplyRoomkey.c | 7 +++---- examples/Send.c | 9 ++++----- examples/SendEncrypted.c | 11 +++++------ examples/Sync.c | 11 +++++------ examples/Verify.c | 13 ++++++------- 9 files changed, 49 insertions(+), 58 deletions(-) diff --git a/examples/Cli.c b/examples/Cli.c index 56c23e1..d4d8d22 100644 --- a/examples/Cli.c +++ b/examples/Cli.c @@ -96,7 +96,7 @@ ExecuteCommand( MatrixClientUploadOnetimeKeys(client); } else if (CheckCommand(cmd, "uploaddevicekey")) { - MatrixClientUploadDeviceKey(client); + MatrixClientUploadDeviceKeys(client); } else if (CheckCommand(cmd, "onetimekeys")) { static char buffer[1024]; @@ -131,7 +131,7 @@ ExecuteCommand( else if (CheckCommand(cmd, "todevice")) { static char buffer[30000]; MatrixClientSync(client, - buffer, 30000); + buffer, 30000, ""); const char * todevice; int todeviceLen; mjson_find(buffer, 30000, @@ -249,8 +249,10 @@ ExecuteCommand( else if (CheckCommand(cmd, "initsession")) { CHECK_ARGS(1, "") - if (! MatrixClientInitMegolmOutSession(client, - args[0])) + MatrixMegolmOutSession * megolmOutSession; + if (! MatrixClientNewMegolmOutSession(client, + args[0], + &megolmOutSession)) { printf("Maximum number of Megolm sessions reached (%d)\n", NUM_MEGOLM_SESSIONS); } @@ -269,16 +271,15 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetUserId(&client, USER_ID); MatrixClientLoginPassword(&client, "@pscho:matrix.org", "Wc23EbmB9G3faMq", "abc"); MatrixClientGenerateOnetimeKeys(&client, 10); - MatrixClientUploadDeviceKey(&client); + MatrixClientUploadDeviceKeys(&client); MatrixClientUploadOnetimeKeys(&client); @@ -300,7 +301,7 @@ main(void) MatrixClientDeleteDevice(&client); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; } diff --git a/examples/Decrypt.c b/examples/Decrypt.c index ec320f0..7923693 100644 --- a/examples/Decrypt.c +++ b/examples/Decrypt.c @@ -26,10 +26,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetUserId(&client, USER_ID); @@ -42,7 +41,7 @@ main(void) MatrixClientGenerateOnetimeKeys(&client, 10); MatrixClientUploadOnetimeKeys(&client); - MatrixClientUploadDeviceKey(&client); + MatrixClientUploadDeviceKeys(&client); static char eventBuffer[1024]; MatrixClientGetRoomEvent(&client, @@ -94,8 +93,7 @@ main(void) 128); GetLine(keyStartJson, 1024); printf("keyStartJson: %s\n", keyStartJson); - int concatLen = - snprintf(concat, 1024, "%s%s", publicKey, keyStartJson); + snprintf(concat, 1024, "%s%s", publicKey, keyStartJson); printf("concat: %s\n", concat); olm_sha256(olmUtil, concat, strlen(concat), commitment, 256); printf("hash: %s\n", commitment); @@ -290,15 +288,12 @@ main(void) getchar(); - MatrixMegolmInSession megolmSession; - MatrixClientRequestMegolmInSession(&client, ROOM_ID, SESSION_ID, SENDER_KEY, USER_ID, - DEVICE_ID, - &megolmSession); + DEVICE_ID); // // decrypt room key @@ -310,7 +305,7 @@ main(void) static char encrypted[2048]; static char decrypted[2048]; printf("encrypted:"); - gets(encrypted); + fgets(encrypted, 2048, stdin); printf("(%d) %s;\n", strlen(encrypted), encrypted); MatrixOlmSessionDecrypt(olmSession, 1, encrypted, decrypted, 2048); @@ -337,7 +332,7 @@ main(void) MatrixClientDeleteDevice(&client); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; } diff --git a/examples/Keys.c b/examples/Keys.c index f79488b..17a681f 100644 --- a/examples/Keys.c +++ b/examples/Keys.c @@ -11,10 +11,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client, SERVER); MatrixClientSetAccessToken(&client, ACCESS_TOKEN); MatrixClientSetDeviceId(&client, DEVICE_ID); @@ -26,7 +25,9 @@ main(void) MatrixClientUploadOnetimeKeys(&client); MatrixClientUploadDeviceKeys(&client); - printf("device key: %s\n", client.deviceKey); + char deviceKey[DEVICE_KEY_SIZE]; + MatrixOlmAccountGetDeviceKey(&client.olmAccount, deviceKey, DEVICE_KEY_SIZE); + printf("device key: %s\n", deviceKey); MatrixHttpDeinit(&client); diff --git a/examples/Login.c b/examples/Login.c index 1ffbbc0..08f981a 100644 --- a/examples/Login.c +++ b/examples/Login.c @@ -11,10 +11,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientLoginPassword(&client, USERNAME, @@ -26,7 +25,7 @@ main(void) printf("Expires in (ms): %s\n", client.expireMs); printf("Refresh Token: %s\n", client.refreshToken); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; -} \ No newline at end of file +} diff --git a/examples/ReplyRoomkey.c b/examples/ReplyRoomkey.c index 8d61a4c..7cc506e 100644 --- a/examples/ReplyRoomkey.c +++ b/examples/ReplyRoomkey.c @@ -11,10 +11,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetAccessToken(&client, ACCESS_TOKEN); @@ -34,7 +33,7 @@ main(void) "ULZZOKJBYN", &client.megolmOutSessions[0]); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; } diff --git a/examples/Send.c b/examples/Send.c index 9ab7dfb..281d899 100644 --- a/examples/Send.c +++ b/examples/Send.c @@ -8,10 +8,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetUserId(&client, USER_ID); @@ -30,7 +29,7 @@ main(void) MatrixClientDeleteDevice(&client); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; -} \ No newline at end of file +} diff --git a/examples/SendEncrypted.c b/examples/SendEncrypted.c index c2fda6c..a6cedb5 100644 --- a/examples/SendEncrypted.c +++ b/examples/SendEncrypted.c @@ -9,10 +9,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetUserId(&client, USER_ID); @@ -21,7 +20,7 @@ main(void) "Wc23EbmB9G3faMq", "Test1"); - MatrixClientUploadDeviceKey(&client); + MatrixClientUploadDeviceKeys(&client); MatrixClientGenerateOnetimeKeys(&client, 10); MatrixClientUploadOnetimeKeys(&client); @@ -60,10 +59,10 @@ main(void) ROOM_ID, "m.room.message", "{\"body\":\"Hello\",\"msgtype\":\"m.text\"}"); - + MatrixClientDeleteDevice(&client); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; } diff --git a/examples/Sync.c b/examples/Sync.c index eafed27..b503f13 100644 --- a/examples/Sync.c +++ b/examples/Sync.c @@ -16,10 +16,9 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); + MatrixClientInit(&client); - MatrixHttpInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetUserId(&client, USER_ID); @@ -30,7 +29,7 @@ main(void) MatrixClientGenerateOnetimeKeys(&client, 10); MatrixClientUploadOnetimeKeys(&client); - MatrixClientUploadDeviceKey(&client); + MatrixClientUploadDeviceKeys(&client); static char eventBuffer[1024]; @@ -87,7 +86,7 @@ main(void) MatrixClientDeleteDevice(&client); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; -} \ No newline at end of file +} diff --git a/examples/Verify.c b/examples/Verify.c index ba8989a..2544f16 100644 --- a/examples/Verify.c +++ b/examples/Verify.c @@ -291,13 +291,13 @@ HandleEvent( MatrixOlmSession * olmSession; if (messageTypeInt == 0) { - MatrixClientGetOlmSessionIn(client, + MatrixClientNewOlmSessionIn(client, USER_ID, DEVICE_ID, encrypted, &olmSession); } else { - MatrixClientGetOlmSessionOut(client, + MatrixClientNewOlmSessionOut(client, USER_ID, DEVICE_ID, &olmSession); @@ -479,9 +479,8 @@ int main(void) { MatrixClient client; - MatrixClientInit(&client, - SERVER); - MatrixHttpInit(&client); + MatrixClientInit(&client); + MatrixHttpInit(&client.hc, SERVER); MatrixClientSetUserId(&client, USER_ID); MatrixClientLoginPassword(&client, @@ -491,7 +490,7 @@ main(void) printf("deviceId: %s\n", client.deviceId); MatrixClientGenerateOnetimeKeys(&client, 10); MatrixClientUploadOnetimeKeys(&client); - MatrixClientUploadDeviceKey(&client); + MatrixClientUploadDeviceKeys(&client); static char eventBuffer[1024]; MatrixClientGetRoomEvent(&client, @@ -535,7 +534,7 @@ main(void) MatrixClientDeleteDevice(&client); - MatrixHttpDeinit(&client); + MatrixHttpDeinit(&client.hc); return 0; } -- 2.50.1