Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-07 14:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes for Chrome compatibility

Browse Source
This commit is contained in:
Robert Heessels 2018-01-24 10:30:18 +01:00
parent b9e1429dac
commit 2935a21a19
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sea.js
View File

@ -559,7 +559,7 @@
&& Gun.obj.has(p, 'pub') && Gun.obj.has(p, 'key')) { && Gun.obj.has(p, 'pub') && Gun.obj.has(p, 'key')) {
const { pub: id } = p const { pub: id } = p
const importAndStoreKey = async () => { const importAndStoreKey = async () => {
const key = importKey(p) const key = await importKey(p)
await seaCallOnStorage((store) => { await seaCallOnStorage((store) => {
store.put({ id, key }) store.put({ id, key })
}) })
@ -1147,11 +1147,11 @@ Object.assign(User, {
} }
const doIt = (resolve, reject) => { const doIt = (resolve, reject) => {
ecdhSubtle.importKey('jwk', keystoecdhjwk(m), ecdhkeyprops, false, ['deriveKey']) ecdhSubtle.importKey('jwk', keystoecdhjwk(m), ecdhkeyprops, false, ['deriveKey'])
.then((public) => { .then((pub) => {
ecdhSubtle.importKey( ecdhSubtle.importKey(
'jwk', keystoecdhjwk(p.epub, p.epriv), ecdhkeyprops, false, ['deriveKey'] 'jwk', keystoecdhjwk(p.epub, p.epriv), ecdhkeyprops, false, ['deriveKey']
).then((privkey) => { ).then((privkey) => {
const props = Object.assign({}, ecdhkeyprops, { public }) const props = Object.assign({}, ecdhkeyprops, { pub })
ecdhSubtle.deriveKey( ecdhSubtle.deriveKey(
props, privkey, {name: 'AES-CBC', length: 256}, true, ['encrypt', 'decrypt'] props, privkey, {name: 'AES-CBC', length: 256}, true, ['encrypt', 'decrypt']
).then((derivedkey) => ecdhSubtle.exportKey('jwk', derivedkey) ).then((derivedkey) => ecdhSubtle.exportKey('jwk', derivedkey)
@ -1201,11 +1201,17 @@ Object.assign(User, {
subtle.encrypt({ subtle.encrypt({
name: 'AES-CBC', iv: new Uint8Array(rands.iv) name: 'AES-CBC', iv: new Uint8Array(rands.iv)
}, aesKey, new TextEncoder().encode(m)).then((ct) => { }, aesKey, new TextEncoder().encode(m)).then((ct) => {
aesKey.handle.fill(0) /*
MARK TO @mhelander : webcrypto has nu handle
*/
// aesKey.handle.fill(0)
r.ct = Buffer.from(ct, 'binary').toString('base64') r.ct = Buffer.from(ct, 'binary').toString('base64')
resolve(JSON.stringify(r)) resolve(JSON.stringify(r))
}).catch((e) => { }).catch((e) => {
aesKey.handle.fill(0) /*
MARK TO @mhelander : webcrypto has nu handle
*/
// aesKey.handle.fill(0)
throw e throw e
}) })
) )
@ -1230,7 +1236,10 @@ Object.assign(User, {
}, aesKey, new Uint8Array(Buffer.from(mm.ct, 'base64'))).then( }, aesKey, new Uint8Array(Buffer.from(mm.ct, 'base64'))).then(
(ct) => new TextDecoder('utf8').decode(ct) (ct) => new TextDecoder('utf8').decode(ct)
).then((ctUtf8) => { ).then((ctUtf8) => {
aesKey.handle.fill(0) /*
MARK TO @mhelander : webcrypto has nu handle
*/
// aesKey.handle.fill(0)
resolve(parseProps(ctUtf8)) resolve(parseProps(ctUtf8))
}) })
).catch((e) => { Gun.log(e); reject(e) }) ).catch((e) => { Gun.log(e); reject(e) })