Include asmCrypto via npm

This commit is contained in:
Tankred Hase 2016-02-04 09:42:49 +07:00
parent edd51d6052
commit cfe058596f
6 changed files with 5 additions and 11 deletions

View File

@ -31,7 +31,6 @@
"afterEach": true, "afterEach": true,
"escape": true, "escape": true,
"unescape": true, "unescape": true,
"asmCrypto": true,
"postMessage": true "postMessage": true
} }
} }

View File

@ -14,12 +14,7 @@ module.exports = function(grunt) {
'src/crypto/public_key/elgamal.js', 'src/crypto/public_key/elgamal.js',
'src/crypto/public_key/index.js', 'src/crypto/public_key/index.js',
'src/crypto/public_key/rsa.js', 'src/crypto/public_key/rsa.js',
'src/crypto/cfb.js', 'src/crypto/*.js',
'src/crypto/crypto.js',
'src/crypto/index.js',
'src/crypto/pkcs1.js',
'src/crypto/random.js',
'src/crypto/signature.js',
'src/encoding/*.js', 'src/encoding/*.js',
'src/hkp/*.js', 'src/hkp/*.js',
'src/keyring/*.js', 'src/keyring/*.js',

View File

@ -52,6 +52,7 @@
"whatwg-fetch": "~0.11.0" "whatwg-fetch": "~0.11.0"
}, },
"dependencies": { "dependencies": {
"asmcrypto": "git://github.com/openpgpjs/asmcrypto.js.git#openpgp_build",
"es6-promise": "^1.0.0", "es6-promise": "^1.0.0",
"node-fetch": "^1.3.3", "node-fetch": "^1.3.3",
"node-localstorage": "~1.1.2", "node-localstorage": "~1.1.2",

View File

@ -6,8 +6,9 @@
* @module crypto/hash * @module crypto/hash
*/ */
var sha = require('./sha.js'), var sha = require('./sha.js'),
asmCrypto = require('asmcrypto'),
rusha = require('./rusha.js'), rusha = require('./rusha.js'),
config = require('../../config') config = require('../../config'),
util = require('../../util.js'); util = require('../../util.js');
var rusha_obj = new rusha(); var rusha_obj = new rusha();

View File

@ -5,9 +5,6 @@
'use strict'; 'use strict';
// asmCrypto global object (AES CFB, SHA1, SHA256, SHA512)
require('./asmcrypto.js');
module.exports = { module.exports = {
/** @see module:crypto/cipher */ /** @see module:crypto/cipher */
cipher: require('./cipher'), cipher: require('./cipher'),

View File

@ -39,6 +39,7 @@ module.exports = SymEncryptedIntegrityProtected;
var util = require('../util.js'), var util = require('../util.js'),
crypto = require('../crypto'), crypto = require('../crypto'),
enums = require('../enums.js'), enums = require('../enums.js'),
asmCrypto = require('asmcrypto'),
nodeCrypto = util.getNodeCrypto(), nodeCrypto = util.getNodeCrypto(),
Buffer = util.getNodeBuffer(); Buffer = util.getNodeBuffer();