1 files changed, 10 insertions, 12 deletions

diff --git a/frontend/beta/js/Clipperz/Crypto/AES.js b/frontend/beta/js/Clipperz/Crypto/AES.js
index 7ddda3e..a5c63fb 100644
--- a/frontend/beta/js/Clipperz/Crypto/AES.js
+++ b/frontend/beta/js/Clipperz/Crypto/AES.js
@@ -1,214 +1,212 @@
 /*
 
-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;
         
         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;
         },
         
         'executionStep': function() {
                 return this._executionStep;
         },
         
         'setExecutionStep': function(aValue) {
                 this._executionStep = aValue;
         },
         
         'pause': function(aValue) {
                 return MochiKit.Async.wait(Clipperz.Crypto.AES.DeferredExecution.pauseTime, aValue);
         },
         
         //-----------------------------------------------------------------------------
         __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");
                 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;