clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 18:39:01 +01:00
Code Issues Releases Wiki Activity

Fixed reference to updated AES implementation

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2015-10-02 14:47:57 +02:00
parent 313fd48551
commit bca32b8515
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/delta/js/Clipperz/PM/PIN.js
View File

@ -101,7 +101,6 @@ MochiKit.Base.update(Clipperz.PM.PIN, {
'encryptPassphraseWithPin': function(aPIN, aPassphrase) { 'encryptPassphraseWithPin': function(aPIN, aPassphrase) {
var byteArrayPassphrase = new Clipperz.ByteArray(aPassphrase); var byteArrayPassphrase = new Clipperz.ByteArray(aPassphrase);
// var hashedPassphrase = Clipperz.Crypto.SHA.sha_d256(ba) // ??? why would i hash the passphrase???
var randomBytesLength = this.ENCRYPTED_PASSPHRASE_LENGTH-byteArrayPassphrase.length()-1; var randomBytesLength = this.ENCRYPTED_PASSPHRASE_LENGTH-byteArrayPassphrase.length()-1;
var randomBytes = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(randomBytesLength); var randomBytes = Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(randomBytesLength);
var derivedKey = this.deriveKeyFromPin(aPIN); var derivedKey = this.deriveKeyFromPin(aPIN);
@ -109,13 +108,13 @@ MochiKit.Base.update(Clipperz.PM.PIN, {
byteArrayPassphrase.appendByte(0); byteArrayPassphrase.appendByte(0);
byteArrayPassphrase.appendBytes(randomBytes.arrayValues()); byteArrayPassphrase.appendBytes(randomBytes.arrayValues());
return Clipperz.Crypto.AES.encrypt(derivedKey, byteArrayPassphrase).toBase64String(); return Clipperz.Crypto.AES_2.encrypt(derivedKey, byteArrayPassphrase).toBase64String();
}, },
'decryptPassphraseWithPin': function(aPIN, anEncryptedPassphrase) { 'decryptPassphraseWithPin': function(aPIN, anEncryptedPassphrase) {
var byteArrayEncryptedPassphrase = (new Clipperz.ByteArray()).appendBase64String(anEncryptedPassphrase); var byteArrayEncryptedPassphrase = (new Clipperz.ByteArray()).appendBase64String(anEncryptedPassphrase);
var derivedKey = this.deriveKeyFromPin(aPIN); var derivedKey = this.deriveKeyFromPin(aPIN);
var byteArrayPassphrase = Clipperz.Crypto.AES.decrypt(derivedKey, byteArrayEncryptedPassphrase); var byteArrayPassphrase = Clipperz.Crypto.AES_2.decrypt(derivedKey, byteArrayEncryptedPassphrase);
var arrayPassphrase = byteArrayPassphrase.arrayValues(); var arrayPassphrase = byteArrayPassphrase.arrayValues();
var slicedArrayPassphrase = arrayPassphrase.slice(0, arrayPassphrase.indexOf(0)); var slicedArrayPassphrase = arrayPassphrase.slice(0, arrayPassphrase.indexOf(0));