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,34 +1,32 @@
 /*
 
-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!";
 //}  
 
@@ -111,49 +109,48 @@ Clipperz.Crypto.AES.DeferredExecutionContext.prototype = MochiKit.Base.update(nu
                 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() + ")";
@@ -799,60 +796,56 @@ MochiKit.Base.update(Clipperz.Crypto.AES, {
                 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"
         
 });
 
 //#############################################################################