moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

replaced pbkdf2 impl with forge

This commit is contained in:
Tankred Hase 2013-05-14 12:01:51 +02:00
parent 01469356dd
commit 2b50bc2308
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/crypto/pbkdf2-worker.js
View File

@ -2,11 +2,7 @@
'use strict';
// import web worker dependencies
importScripts('../../lib/crypto-js/core.js');
importScripts('../../lib/crypto-js/enc-base64.js');
importScripts('../../lib/crypto-js/sha1.js');
importScripts('../../lib/crypto-js/hmac.js');
importScripts('../../lib/crypto-js/pbkdf2.js');
importScripts('../../lib/forge/forge.rsa.bundle.js');
importScripts('../app-config.js');
importScripts('./pbkdf2.js');

11
src/js/crypto/pbkdf2.js
View File

@ -1,5 +1,5 @@
/**
* A Wrapper for Crypto.js's PBKDF2 function
* A Wrapper for Forge's PBKDF2 function
*/
app.crypto.PBKDF2 = function() {
'use strict';
@ -11,12 +11,9 @@ app.crypto.PBKDF2 = function() {
* @return [String] The base64 encoded key
*/
this.getKey = function(password, keySize) {
var salt = CryptoJS.enc.Base64.parse("vbhmLjC+Ub6MSbhS6/CkOwxB25wvwRkSLP2DzDtYb+4="); // from random 256 bit value
var key = CryptoJS.PBKDF2(password, salt, {
keySize: keySize / 32,
iterations: 1000
});
var keyBase64 = CryptoJS.enc.Base64.stringify(key);
var salt = forge.util.decode64("vbhmLjC+Ub6MSbhS6/CkOwxB25wvwRkSLP2DzDtYb+4=");
var key = forge.pkcs5.pbkdf2(password, salt, 1000, keySize / 8);
var keyBase64 = forge.util.encode64(key);
return keyBase64;
};

2
src/lib/forge/forge.rsa.bundle.js
View File

@ -11659,4 +11659,4 @@ if(nodeDefine || typeof define === 'function') {
}
})();
})((typeof window !== 'undefined') ? window : null);
})((typeof window !== 'undefined') ? window : 'undefined');