diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-05-25 15:33:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-05-25 15:33:33 +0100 |
| commit | 54d43010c808b56caa703696a036df18d2b74575 (patch) | |
| tree | 61cbc677c61e050a41669f858388a6d6cc7d732e /python/test_olm.sh | |
| parent | 024685f3db2be6c4cfb55670ecc92d8d1a0c9a8d (diff) | |
| parent | 8d55954ce13b9f93cc220bcbaab56fb236d16c9c (diff) | |
Merge branch 'rav/jenkins_build'
Diffstat (limited to 'python/test_olm.sh')
| -rwxr-xr-x | python/test_olm.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/python/test_olm.sh b/python/test_olm.sh index b575cbf..916322e 100755 --- a/python/test_olm.sh +++ b/python/test_olm.sh @@ -1,5 +1,7 @@ #! /bin/bash +cd `dirname $0` + OLM="python -m olm" ALICE_ACCOUNT=alice.account @@ -14,8 +16,8 @@ $OLM create_account $ALICE_ACCOUNT $OLM create_account $BOB_ACCOUNT $OLM generate_keys $BOB_ACCOUNT 1 -BOB_IDENTITY_KEY="$($OLM keys --json $BOB_ACCOUNT | jq -r .account_keys.curve25519)" -BOB_ONE_TIME_KEY="$($OLM keys --json $BOB_ACCOUNT | jq -r '.one_time_keys.curve25519|to_entries[0].value')" +BOB_IDENTITY_KEY="$($OLM identity_key $BOB_ACCOUNT)" +BOB_ONE_TIME_KEY="$($OLM one_time_key $BOB_ACCOUNT)" $OLM outbound $ALICE_ACCOUNT $ALICE_SESSION "$BOB_IDENTITY_KEY" "$BOB_ONE_TIME_KEY" |