1 files changed, 11 insertions, 18 deletions

diff --git a/frontend/gamma/js/Clipperz/Crypto/AES.js b/frontend/gamma/js/Clipperz/Crypto/AES.js
index c811f1c..cb56f11 100644
--- a/frontend/gamma/js/Clipperz/Crypto/AES.js
+++ b/frontend/gamma/js/Clipperz/Crypto/AES.js
@@ -1,243 +1,240 @@
 /*
 
-Copyright 2008-2011 Clipperz Srl
+Copyright 2008-2013 Clipperz Srl
 
-This file is part of Clipperz Community Edition.
-Clipperz Community Edition is an online password manager.
+This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 
-* Clipperz Community Edition is free software: you can redistribute
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
+* Clipperz is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Affero General Public License as published
+  by the Free Software Foundation, either version 3 of the License, or 
+  (at your option) any later version.
 
-* Clipperz Community Edition is distributed in the hope that it will
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+* Clipperz is distributed in the hope that it will be useful, but 
+  WITHOUT ANY WARRANTY; without even the implied warranty of 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the GNU Affero General Public License for more details.
 
 * You should have received a copy of the GNU Affero General Public
-  License along with Clipperz Community Edition.  If not, see
-  <http://www.gnu.org/licenses/>.
+  License along with Clipperz. If not, see http://www.gnu.org/licenses/.
 
 */
 
 try { if (typeof(Clipperz.ByteArray) == 'undefined') { throw ""; }} catch (e) {
         throw "Clipperz.Crypto.AES depends on Clipperz.ByteArray!";
 }  
 
         //Dependency commented to avoid a circular reference
 //try { if (typeof(Clipperz.Crypto.PRNG) == 'undefined') { throw ""; }} catch (e) {
         //throw "Clipperz.Crypto.AES depends on Clipperz.Crypto.PRNG!";
 //}  
 
 if (typeof(Clipperz.Crypto.AES) == 'undefined') { Clipperz.Crypto.AES = {}; }
 
 //#############################################################################
 
 Clipperz.Crypto.AES.DeferredExecutionContext = function(args) {
         args = args || {};
 
         this._key = args.key;
         this._message = args.message;
         this._result = args.message.clone();
         this._nonce = args.nonce;
         this._messageLength = this._message.length();
         
         this._messageArray = this._message.arrayValues();
         this._resultArray = this._result.arrayValues();
         this._nonceArray = this._nonce.arrayValues();
         
         this._executionStep = 0;
         
         //      this._elaborationChunkSize = 1024;      //      4096;   //      16384;  //4096;
         this._elaborationChunks = 10;
                 this._pauseTime = 0.02;                                 //      0.02    //0.2;
 
         return this;
 }
 
 Clipperz.Crypto.AES.DeferredExecutionContext.prototype = MochiKit.Base.update(null, {
 
         'key': function() {
                 return this._key;
         },
         
         'message': function() {
                 return this._message;
         },
         
         'messageLength': function() {
                 return this._messageLength;
         },
         
         'result': function() {
                 return new Clipperz.ByteArray(this.resultArray());
         },
         
         'nonce': function() {
                 return this._nonce;
         },
 
         'messageArray': function() {
                 return this._messageArray;
         },
         
         'resultArray': function() {
                 return this._resultArray;
         },
         
         'nonceArray': function() {
                 return this._nonceArray;
         },
 
         'elaborationChunkSize': function() {
         //      return Clipperz.Crypto.AES.DeferredExecution.chunkSize;
         //      return this._elaborationChunkSize;
                 return (this._elaborationChunks * 1024);
         },
         
         'executionStep': function() {
                 return this._executionStep;
         },
         
         'setExecutionStep': function(aValue) {
                 this._executionStep = aValue;
         },
         
         'tuneExecutionParameters': function (anElapsedTime) {
 //var originalChunks = this._elaborationChunks;
                 if (anElapsedTime > 0) {
                         this._elaborationChunks = Math.round(this._elaborationChunks * ((anElapsedTime + 1000)/(anElapsedTime * 2)));
                 }
 //Clipperz.log("tuneExecutionParameters - elapsedTime: " +  anElapsedTime + /*originalChunks,*/ " chunks # " + this._elaborationChunks + " [" + this._executionStep + " / " + this._messageLength + "]");
         },
         
         'pause': function(aValue) {
         //      return MochiKit.Async.wait(Clipperz.Crypto.AES.DeferredExecution.pauseTime, aValue);
                 return MochiKit.Async.wait(this._pauseTime, aValue);
         },
         
         'isDone': function () {
-//console.log("isDone", this.executionStep(), this.messageLength());
                 return (this._executionStep >= this._messageLength);
         },
 
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 
 });
 
 //#############################################################################
 
 Clipperz.Crypto.AES.Key = function(args) {
         args = args || {};
 
         this._key = args.key;
         this._keySize = args.keySize || this.key().length();
         
         if (this.keySize() == 128/8) {
                 this._b = 176;
                 this._numberOfRounds = 10;
          } else if (this.keySize() == 256/8) {
                 this._b = 240;
                 this._numberOfRounds = 14;
         } else {
-                MochiKit.Logging.logError("AES unsupported key size: " + (this.keySize() * 8) + " bits");
+                Clipperz.logError("AES unsupported key size: " + (this.keySize() * 8) + " bits");
                 throw Clipperz.Crypto.AES.exception.UnsupportedKeySize;
         }
         
         this._stretchedKey = null;
         
         return this;
 }
 
 Clipperz.Crypto.AES.Key.prototype = MochiKit.Base.update(null, {
 
         'asString': function() {
                 return "Clipperz.Crypto.AES.Key (" + this.key().toHexString() + ")";
         },
         
         //-----------------------------------------------------------------------------
 
         'key': function() {
                 return this._key;
         },
 
         'keySize': function() {
                 return this._keySize;
         },
         
         'b': function() {
                 return this._b;
         },
         
         'numberOfRounds': function() {
                 return this._numberOfRounds;
         },
         //=========================================================================
 
         'keyScheduleCore': function(aWord, aRoundConstantsIndex) {
                         varresult;
                 var sbox;
 
                 sbox = Clipperz.Crypto.AES.sbox();
 
                         result = [sbox[aWord[1]] ^ Clipperz.Crypto.AES.roundConstants()[aRoundConstantsIndex],
                                         sbox[aWord[2]],
                                         sbox[aWord[3]],
                                                 sbox[aWord[0]]];
 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'xorWithPreviousStretchValues': function(aKey, aWord, aPreviousWordIndex) {
                         varresult;
                 var i,c;
                 
                 result = [];
                 c = 4;
                 for (i=0; i<c; i++) {
                         result[i] = aWord[i] ^ aKey.byteAtIndex(aPreviousWordIndex + i);
                 }
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'sboxShakeup': function(aWord) {
                 var result;
                 var sbox;
                 var i,c;
                 
                 result = [];
                 sbox = Clipperz.Crypto.AES.sbox();
                 c =4;
                 for (i=0; i<c; i++) {
                         result[i] = sbox[aWord[i]];
                 }
                 
                 return result;
         },
 
         //-----------------------------------------------------------------------------
 
         'stretchKey': function(aKey) {
                         varcurrentWord;
                         varkeyLength;
                         varpreviousStretchIndex;
                 var i,c;
                 
                 keyLength = aKey.length();
                 previousStretchIndex = keyLength - this.keySize();
 
                         currentWord = [aKey.byteAtIndex(keyLength - 4),
                                                 aKey.byteAtIndex(keyLength - 3),
                                                 aKey.byteAtIndex(keyLength - 2),
                                                         aKey.byteAtIndex(keyLength - 1)];
                 currentWord = this.keyScheduleCore(currentWord, keyLength / this.keySize());
 
@@ -715,152 +712,148 @@ MochiKit.Base.update(Clipperz.Crypto.AES, {
                         varmessageLength;
                         var blockSize;
                 var executionLimit;
                 var startTime, endTime;
 
                 self = Clipperz.Crypto.AES;
                 startTime = new Date();
                 blockSize = 128/8;
                 messageLength = anExecutionContext.messageArray().length;
                 nonce = anExecutionContext.nonceArray();
                 result = anExecutionContext.resultArray();
 
                 messageIndex = anExecutionContext.executionStep();
                 executionLimit = messageIndex + anExecutionContext.elaborationChunkSize();
                 executionLimit = Math.min(executionLimit, messageLength);
                 
                 while (messageIndex < executionLimit) {
                         var encryptedBlock;
                         var i,c;
                         
                         self.incrementNonce(nonce);
                         encryptedBlock = self.encryptBlock(anExecutionContext.key(), nonce);
                         
                         if ((executionLimit - messageIndex) > blockSize) {
                                 c = blockSize;
                         } else {
                                 c = executionLimit - messageIndex;
                         }
                         
                         for (i=0; i<c; i++) {
                                 result[messageIndex + i] = result[messageIndex + i] ^ encryptedBlock[i];
                         }
                         
                         messageIndex += blockSize;
                 }
                 anExecutionContext.setExecutionStep(messageIndex);
                 endTime = new Date();
                 anExecutionContext.tuneExecutionParameters(endTime - startTime);
                 
                 return anExecutionContext;
         },
 
         //-----------------------------------------------------------------------------
 /*
         'deferredEncryptBlocks': function(anExecutionContext) {
                         vardeferredResult;
                         varmessageSize;
                 var i,c;
                 
                         messageSize = anExecutionContext.messageLength();       
                 
                 deferredResult = new Clipperz.Async.Deferred("AES.deferredEncryptBloks");
 
                 c = Math.ceil(messageSize / anExecutionContext.elaborationChunkSize());
                 for (i=0; i<c; i++) {
                         deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncryptExecutionChunk);
                         deferredResult.addMethod(anExecutionContext, 'pause');
                 }
                 
                 deferredResult.callback(anExecutionContext);
                 
                 return deferredResult;
         },
 */
 
         'deferredEncryptBlocks': function(anExecutionContext) {
                         vardeferredResult;
 
                 if (! anExecutionContext.isDone()) {
                         deferredResult = Clipperz.Async.callbacks("Clipperz.Crypto.AES.deferredEncryptBloks", [
                                 Clipperz.Crypto.AES.deferredEncryptExecutionChunk,
                                 MochiKit.Base.method(anExecutionContext, 'pause'),
                                 Clipperz.Crypto.AES.deferredEncryptBlocks
                         ], {trace:false}, anExecutionContext);
                 } else {
                         deferredResult = MochiKit.Async.succeed(anExecutionContext);
                 }
                 
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
         
         'deferredEncrypt': function(aKey, someData, aNonce) {
                 var deferredResult;
                         varexecutionContext;
                 var result;
                 var nonce;
                 var key;
 
                 key = new Clipperz.Crypto.AES.Key({key:aKey});
                 nonce = aNonce ? aNonce.clone() : Clipperz.Crypto.PRNG.defaultRandomGenerator().getRandomBytes(128/8);
 
                 executionContext = new Clipperz.Crypto.AES.DeferredExecutionContext({key:key, message:someData, nonce:nonce});
 
                 deferredResult = new Clipperz.Async.Deferred("AES.deferredEncrypt");
-//deferredResult.addCallback(function (aValue) { console.log(">>> deferredEncrypt"); return aValue; });
                 deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncryptBlocks);
                 deferredResult.addCallback(function(anExecutionContext) {
                         var result;
                         
                         result = anExecutionContext.nonce().clone();
                         result.appendBytes(anExecutionContext.resultArray());
 
                         return result;
                 });
-//deferredResult.addCallback(function (aValue) { console.log("<<< deferredEncrypt"); return aValue; });
                 deferredResult.callback(executionContext)
 
                 return deferredResult;
         },
 
         //-----------------------------------------------------------------------------
 
         'deferredDecrypt': function(aKey, someData) {
                 var deferredResult
                 var nonce;
                 var message;
                 var key;
 
                 key = new Clipperz.Crypto.AES.Key({key:aKey});
                 nonce = someData.split(0, (128/8));
                 message = someData.split(128/8);
                 executionContext = new Clipperz.Crypto.AES.DeferredExecutionContext({key:key, message:message, nonce:nonce});
 
                 deferredResult = new Clipperz.Async.Deferred("AES.deferredDecrypt");
-//deferredResult.addCallback(function (aValue) { console.log(">>> deferredDecrypt"); return aValue; });
                 deferredResult.addCallback(Clipperz.Crypto.AES.deferredEncryptBlocks);
                 deferredResult.addCallback(function(anExecutionContext) {
                         return anExecutionContext.result();
                 });
-//deferredResult.addCallback(function (aValue) { console.log("<<< deferredDecrypt"); return aValue; });
                 deferredResult.callback(executionContext);
 
                 return deferredResult;
         },
         
         //-----------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
         
 });
 
 //#############################################################################
 
 //Clipperz.Crypto.AES.DeferredExecution = {
         //      'chunkSize': 16384,     //      4096,   //      1024    4096    8192    1638432768;
         //      'pauseTime': 0.02       //0.2
 //}
 
 Clipperz.Crypto.AES.exception = {
         'UnsupportedKeySize':    new MochiKit.Base.NamedError("Clipperz.Crypto.AES.exception.UnsupportedKeySize") 
 };