1 files changed, 6 insertions, 9 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/Crypto.js b/frontend/gamma/js/Clipperz/PM/Crypto.js
index bfafbea..31fe349 100644
--- a/frontend/gamma/js/Clipperz/PM/Crypto.js
+++ b/frontend/gamma/js/Clipperz/PM/Crypto.js
@@ -1,152 +1,149 @@
 /*
 
 Copyright 2008-2011 Clipperz Srl
 
-This file is part of Clipperz's Javascript Crypto Library.
-Javascript Crypto Library provides web developers with an extensive
-and efficient set of cryptographic functions. The library aims to
-obtain maximum execution speed while preserving modularity and
-reusability.
+This file is part of Clipperz Community Edition.
+Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
-refer to http://www.clipperz.com
+refer to http://www.clipperz.com.
 
-* Javascript Crypto Library is free software: you can redistribute
+* 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.
 
-* Javascript Crypto Library is distributed in the hope that it will
+* 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.
   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 Javascript Crypto Library.  If not, see
+  License along with Clipperz Community Edition.  If not, see
   <http://www.gnu.org/licenses/>.
 
 */
 
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Crypto) == 'undefined') { Clipperz.PM.Crypto = {}; }
 
 Clipperz.PM.Crypto.VERSION = "0.2";
 Clipperz.PM.Crypto.NAME = "Clipperz.PM.Crypto";
 
 Clipperz.PM.Crypto.encryptingFunctions = {};
 
 MochiKit.Base.update(Clipperz.PM.Crypto, {
 
         '__repr__': function () {
                 return "[" + this.NAME + " " + this.VERSION + "]";
         },
 
         //-------------------------------------------------------------------------
 
         'toString': function () {
                 return this.__repr__();
         },
 
         //-------------------------------------------------------------------------
 /*
         'communicationProtocol': {
                 'currentVersion': '0.2',
                 'versions': {
                                 '0.1': Clipperz.PM.Connection.SRP['1.0'],//Clipperz.Crypto.SRP.versions['1.0'].Connection,
                                 '0.2': Clipperz.PM.Connection.SRP['1.1']//Clipperz.Crypto.SRP.versions['1.1'].Connection
                 },
                 'fallbackVersions': {
                                 'current':'0.1',
                                 '0.2':  '0.1',
                                 '0.1':  null
                 }
         },
 */
         //-------------------------------------------------------------------------
 
         'encryptingFunctions': {
                 'currentVersion': '0.3',
                 'versions': {
 
                 //#####################################################################
 
                         '0.1': {
                                 'encrypt': function(aKey, aValue) {
                                         return Clipperz.Crypto.Base.encryptUsingSecretKey(aKey, Clipperz.Base.serializeJSON(aValue));
                                 },
                         
                                 'deferredEncrypt': function(aKey, aValue) {
                                         var deferredResult;
                                         
                                         deferredResult = new Clipperz.Async.Deferred("Crypto[0.1].deferredEncrypt");
                                         deferredResult.addCallback(Clipperz.PM.Crypto.encryptingFunctions.versions['0.1'].encrypt, aKey, aValue);
                                         deferredResult.callback();
                                         
                                         return deferredResult;
                                 },
                                 
                                 'decrypt': function(aKey, aValue) {
                                         var result;
                                 
                                         if (aValue != null) {
                                                 result = Clipperz.Base.evalJSON(Clipperz.Crypto.Base.decryptUsingSecretKey(aKey, aValue));
                                         } else {
                                                 result = null;
                                         }
                                 
                                         return result;
                                 },
                                 
                                 'deferredDecrypt': function(aKey, aValue) {
                                         var deferredResult;
                                         
                                         deferredResult = new Clipperz.Async.Deferred("Crypto.[0.1].deferredDecrypt");
                                         deferredResult.addCallback(Clipperz.PM.Crypto.encryptingFunctions.versions['0.1'].decrypt, aKey, aValue);
                                         deferredResult.callback();
                                         
                                         return deferredResult;
                                 },
                         
                                 'hash': function(aValue) {
                                         var result;
                                         var strngResult;
                                 
                                                 stringResult = Clipperz.Crypto.Base.computeHashValue(aValue.asString());        //!!!!!!!
                                         result = new Clipperz.ByteArray("0x" + stringResult);
                                 
                                         return result;
                                 },
                                 
                                 'deriveKey': function(aStringValue) {
                                         return Clipperz.Crypto.Base.computeHashValue(aStringValue);
                                 }
                         },
 
                 //#####################################################################
 
                         '0.2': {
                                 'encrypt': function(aKey, aValue, aNonce) {
                                         var result;
                                                 varkey, value;
                                         var dataToEncrypt;
                                         var encryptedData;
                                 
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                         value = new Clipperz.ByteArray(Clipperz.Base.serializeJSON(aValue));
                                         dataToEncrypt = Clipperz.Crypto.SHA.sha_d256(value).appendBlock(value);
                                         encryptedData = Clipperz.Crypto.AES.encrypt(key, dataToEncrypt, aNonce);
                                         result = encryptedData.toBase64String();
                                 
                                         return result;
                                 },
 
                                 'deferredEncrypt': function(aKey, aValue, aNonce) {
                                         var deferredResult;
                                                 varkey, value;
                                         var dataToEncrypt;
         //                              var encryptedData;
                                 
                                         key = Clipperz.Crypto.SHA.sha_d256(new Clipperz.ByteArray(aKey));
                                         value = new Clipperz.ByteArray(Clipperz.Base.serializeJSON(aValue));
                                         dataToEncrypt = Clipperz.Crypto.SHA.sha_d256(value).appendBlock(value);