Commit 5ded2220 authored by JC Brand's avatar JC Brand

identity_key should be stored as base64, not array buffer

parent fa0e7aef
...@@ -74173,7 +74173,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -74173,7 +74173,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
try { try {
return sessionBuilder.processPreKey({ return sessionBuilder.processPreKey({
'registrationId': parseInt(_converse.omemo_store.get('device_id'), 10), 'registrationId': parseInt(_converse.omemo_store.get('device_id'), 10),
'identityKey': _converse.omemo_store.get('identity_key'), 'identityKey': u.base64ToArrayBuffer(_converse.omemo_store.get('identity_key')),
'signedPreKey': { 'signedPreKey': {
'keyId': bundle.signed_prekey.id, 'keyId': bundle.signed_prekey.id,
// <Number> // <Number>
...@@ -74653,7 +74653,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ ...@@ -74653,7 +74653,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
}; };
return libsignal.KeyHelper.generateIdentityKeyPair().then(identity_keypair => { return libsignal.KeyHelper.generateIdentityKeyPair().then(identity_keypair => {
data['identity_keypair'] = identity_keypair; data['identity_keypair'] = identity_keypair;
data['identity_key'] = identity_keypair.pubKey; data['identity_key'] = u.arrayBufferToBase64(identity_keypair.pubKey);
return libsignal.KeyHelper.generateSignedPreKey(identity_keypair, 1); return libsignal.KeyHelper.generateSignedPreKey(identity_keypair, 1);
}).then(signed_prekey => { }).then(signed_prekey => {
_converse.omemo_store.storeSignedPreKey(signed_prekey.keyId, signed_prekey.keyPair); _converse.omemo_store.storeSignedPreKey(signed_prekey.keyId, signed_prekey.keyPair);
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
try { try {
return sessionBuilder.processPreKey({ return sessionBuilder.processPreKey({
'registrationId': parseInt(_converse.omemo_store.get('device_id'), 10), 'registrationId': parseInt(_converse.omemo_store.get('device_id'), 10),
'identityKey': _converse.omemo_store.get('identity_key'), 'identityKey': u.base64ToArrayBuffer(_converse.omemo_store.get('identity_key')),
'signedPreKey': { 'signedPreKey': {
'keyId': bundle.signed_prekey.id, // <Number> 'keyId': bundle.signed_prekey.id, // <Number>
'publicKey': u.base64ToArrayBuffer(bundle.signed_prekey.public_key), 'publicKey': u.base64ToArrayBuffer(bundle.signed_prekey.public_key),
...@@ -631,7 +631,7 @@ ...@@ -631,7 +631,7 @@
return libsignal.KeyHelper.generateIdentityKeyPair() return libsignal.KeyHelper.generateIdentityKeyPair()
.then(identity_keypair => { .then(identity_keypair => {
data['identity_keypair'] = identity_keypair; data['identity_keypair'] = identity_keypair;
data['identity_key'] = identity_keypair.pubKey; data['identity_key'] = u.arrayBufferToBase64(identity_keypair.pubKey);
return libsignal.KeyHelper.generateSignedPreKey(identity_keypair, 1); return libsignal.KeyHelper.generateSignedPreKey(identity_keypair, 1);
}).then(signed_prekey => { }).then(signed_prekey => {
_converse.omemo_store.storeSignedPreKey(signed_prekey.keyId, signed_prekey.keyPair); _converse.omemo_store.storeSignedPreKey(signed_prekey.keyId, signed_prekey.keyPair);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment