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

Use asmcrypto.js directly + quickfix

Browse Source
This commit is contained in:
Mahrud Sayrafi 2018-02-22 01:30:48 -08:00
parent 8c4fa07dd5
commit d40e8fe428
No known key found for this signature in database
GPG Key ID: C24071B956C3245F
7 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -72,7 +72,7 @@
"whatwg-fetch": "^2.0.3"
},
"dependencies": {
"asmcrypto.js": "github:mahrud/asmcrypto.js",
"asmcrypto.js": "^0.22.0",
"asn1.js": "^5.0.0",
"bn.js": "^4.11.8",
"buffer": "^5.0.8",

2
src/crypto/cipher/aes.js
View File

@ -3,7 +3,7 @@
* @module crypto/cipher/aes
*/
import { AES_ECB } from 'asmcrypto.js';
import { AES_ECB } from 'asmcrypto.js/src/aes/ecb/exports';
// TODO use webCrypto or nodeCrypto when possible.
export default function aes(length) {

2
src/crypto/gcm.js
View File

@ -24,7 +24,7 @@
* @module crypto/gcm
*/
import { AES_GCM } from 'asmcrypto.js';
import { AES_GCM } from 'asmcrypto.js/src/aes/gcm/exports';
import config from '../config';
import util from '../util';

2
src/crypto/hash/index.js
View File

@ -8,7 +8,7 @@
*/
import Rusha from 'rusha';
import { SHA256 } from 'asmcrypto.js';
import { SHA256 } from 'asmcrypto.js/src/hash/sha256/exports';
import sha224 from 'hash.js/lib/hash/sha/224';
import sha384 from 'hash.js/lib/hash/sha/384';
import sha512 from 'hash.js/lib/hash/sha/512';

29
src/crypto/public_key/rsa.js
View File

@ -28,7 +28,9 @@
import BN from 'bn.js';
import { random as asmcrypto_random, RSA, RSA_RAW } from 'asmcrypto.js';
import { RSA } from 'asmcrypto.js/src/rsa/exports-keygen';
import { RSA_RAW } from 'asmcrypto.js/src/rsa/exports-raw';
import { random as asmcrypto_random } from 'asmcrypto.js/src/random/exports';
import random from '../random';
import config from '../../config';
import util from '../../util';
@ -137,13 +139,12 @@ export default {
if (webCrypto) {
let keyPair;
let keyGenOpt;
const Euint8 = E.toArrayLike(Uint8Array); // get bytes of exponent
if ((window.crypto && window.crypto.subtle) || window.msCrypto) {
// current standard spec
keyGenOpt = {
name: 'RSASSA-PKCS1-v1_5',
modulusLength: B, // the specified keysize in bits
publicExponent: Euint8, // take three bytes (max 65537)
publicExponent: E.toArrayLike(Uint8Array), // take three bytes (max 65537) for exponent
hash: {
name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify'
}
@ -154,7 +155,7 @@ export default {
keyGenOpt = {
name: 'RSA-OAEP',
modulusLength: B, // the specified keysize in bits
publicExponent: Euint8, // take three bytes (max 65537)
publicExponent: E.toArrayLike(Uint8Array), // take three bytes (max 65537) for exponent
hash: {
name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify'
}
@ -170,7 +171,7 @@ export default {
// parse raw ArrayBuffer bytes to jwk/json (WebKit/Safari/IE11 quirk)
if (jwk instanceof ArrayBuffer) {
jwk = JSON.parse(String.fromCharCode.apply(null, new Uint8Array(key)));
jwk = JSON.parse(String.fromCharCode.apply(null, new Uint8Array(jwk)));
}
// map JWK parameters to BN
@ -180,7 +181,7 @@ export default {
key.d = b64toBN(jwk.d);
key.p = b64toBN(jwk.p);
key.q = b64toBN(jwk.q);
key.u = key.p.modInverse(key.q);
key.u = key.p.invm(key.q);
return key;
}
@ -195,14 +196,14 @@ export default {
await asmcrypto_random.seed(await random.getRandomBytes(1024)); // FIXME how much randomness?
key = await RSA.generateKey(B, E.toArrayLike(Uint8Array));
return {
n: key[0],
e: key[1],
d: key[2],
q: key[3],
p: key[4],
// dq: key[5],
// dp: key[6],
u: key[7]
n: new BN(key[0]),
e: new BN(key[1]),
d: new BN(key[2]),
q: new BN(key[3]),
p: new BN(key[4]),
// dq: new BN(key[5]),
// dp: new BN(key[6]),
u: new BN(key[7])
};
}
};

2
src/packet/sym_encrypted_integrity_protected.js
View File

@ -32,7 +32,7 @@
* @module packet/sym_encrypted_integrity_protected
*/
import { AES_CFB } from 'asmcrypto.js';
import { AES_CFB } from 'asmcrypto.js/src/aes/cfb/exports';
import crypto from '../crypto';
import enums from '../enums';
import util from '../util';

6
test/crypto/crypto.js
View File

@ -1,5 +1,5 @@
const openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
const asmCrypto = require('asmcrypto.js');
const AES_CFB = require('asmcrypto.js/asmcrypto.all.js').AES_CFB;
const chai = require('chai');
chai.use(require('chai-as-promised'));
@ -297,9 +297,9 @@ describe('API functional testing', function() {
const prefix = util.concatUint8Array([rndm, repeat]);
const symmencData = crypto.cfb.encrypt(rndm, algo, util.str2Uint8Array(plaintext), symmKey, false);
const symmencData2 = asmCrypto.AES_CFB.encrypt(util.concatUint8Array([prefix, util.str2Uint8Array(plaintext)]), symmKey);
const symmencData2 = AES_CFB.encrypt(util.concatUint8Array([prefix, util.str2Uint8Array(plaintext)]), symmKey);
let decrypted = asmCrypto.AES_CFB.decrypt(symmencData, symmKey);
let decrypted = AES_CFB.decrypt(symmencData, symmKey);
decrypted = decrypted.subarray(crypto.cipher[algo].blockSize + 2, decrypted.length);
expect(util.Uint8Array2str(symmencData)).to.equal(util.Uint8Array2str(symmencData2));