suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/asmcrypto

Browse Source
This commit is contained in:
Mahrud Sayrafi 2018-02-27 14:57:34 -08:00 committed by GitHub
commit f04273cd8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/type/ecdh_symkey.js
View File

@ -62,4 +62,8 @@ ECDHSymmetricKey.prototype.write = function () {
return util.concatUint8Array([new Uint8Array([this.data.length]), this.data]);
};
ECDHSymmetricKey.fromClone = function (clone) {
return new ECDHSymmetricKey(clone.data);
};
export default ECDHSymmetricKey;

13
test/general/openpgp.js
View File

@ -2,7 +2,8 @@
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
const sinon = require('sinon');
const spy = require('sinon/lib/sinon/spy');
const stub = require('sinon/lib/sinon/stub');
const chai = require('chai');
chai.use(require('chai-as-promised'));
@ -314,8 +315,8 @@ function withCompression(tests) {
let decompressSpy;
beforeEach(function () {
compressSpy = sinon.spy(openpgp.packet.Compressed.prototype, 'compress');
decompressSpy = sinon.spy(openpgp.packet.Compressed.prototype, 'decompress');
compressSpy = spy(openpgp.packet.Compressed.prototype, 'compress');
decompressSpy = spy(openpgp.packet.Compressed.prototype, 'decompress');
});
afterEach(function () {
@ -388,9 +389,9 @@ describe('OpenPGP.js public api tests', function() {
};
}
};
keyGenStub = sinon.stub(openpgp.key, 'generate');
keyGenStub = stub(openpgp.key, 'generate');
keyGenStub.returns(resolves(keyObjStub));
getWebCryptoAllStub = sinon.stub(openpgp.util, 'getWebCryptoAll');
getWebCryptoAllStub = stub(openpgp.util, 'getWebCryptoAll');
});
afterEach(function() {
@ -523,7 +524,7 @@ describe('OpenPGP.js public api tests', function() {
openpgp.initWorker({
worker: workerStub
});
const proxyGenStub = sinon.stub(openpgp.getWorker(), 'delegate');
const proxyGenStub = stub(openpgp.getWorker(), 'delegate');
getWebCryptoAllStub.returns();
openpgp.generateKey();