3f2ef3a83a12654fb6315dd69dc69e89e15d138e
Files Diff
- Added: 1
- Removed: 1
- Renamed: 0
- Modified: 2
Refactorings reported:
| Refactoring Name | Occurences | ||
|---|---|---|---|
| Rename Method | 4 | ||
| Rename Method public getIv() : byte[] renamed to public getPrimaryMasterKey() : byte[] in class org.cryptomator.crypto.aes256.KeyFile | From | To | |
| Rename Method private aesGcmCipher(key SecretKey, iv byte[], cipherMode int) : Cipher renamed to private aesKeyWrapCipher(key SecretKey, cipherMode int) : Cipher in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Method public setMasterkey(masterkey byte[]) : void renamed to public setHMacMasterKey(hMacMasterKey byte[]) : void in class org.cryptomator.crypto.aes256.KeyFile | From | To | |
| Rename Method public getMasterkey() : byte[] renamed to public getHMacMasterKey() : byte[] in class org.cryptomator.crypto.aes256.KeyFile | From | To | |
| Rename Variable | 3 | ||
| Rename Variable encryptedCombinedKey : byte[] to wrappedPrimaryKey : byte[] in method public encryptMasterKey(out OutputStream, password CharSequence) : void in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Variable userKey : SecretKey to kek : SecretKey in method public decryptMasterKey(in InputStream, password CharSequence) : void in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Variable userKey : SecretKey to kek : SecretKey in method public encryptMasterKey(out OutputStream, password CharSequence) : void in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Class | 1 | ||
| Rename Class org.cryptomator.crypto.aes256.Key renamed to org.cryptomator.crypto.aes256.KeyFile | From | To | |
| Replace Variable With Attribute | 1 | ||
| Replace Variable With Attribute secretKey : SecretKeySpec to hMacMasterKey : SecretKey in method private hmacSha256(data byte[]) : byte[] in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Attribute | 3 | ||
| Rename Attribute AES_GCM_CIPHER : String to AES_KEYWRAP_CIPHER : String in class org.cryptomator.crypto.aes256.AesCryptographicConfiguration | From | To | |
| Rename Attribute CRYPTO_ALGORITHM : String to AES_KEY_ALGORITHM : String in class org.cryptomator.crypto.aes256.AesCryptographicConfiguration | From | To | |
| Rename Attribute masterkey : byte[] to hMacMasterKey : byte[] in class org.cryptomator.crypto.aes256.KeyFile | From | To | |
| Change Variable Type | 3 | ||
| Change Variable Type secretKey : SecretKeySpec to hMacMasterKey : SecretKey in method private hmacSha256(data byte[]) : byte[] in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Change Variable Type key : Key to key : KeyFile in method public decryptMasterKey(in InputStream, password CharSequence) : void in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Change Variable Type key : Key to key : KeyFile in method public encryptMasterKey(out OutputStream, password CharSequence) : void in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Parameter | 2 | ||
| Rename Parameter keyLength : int to keyLengthInBits : int in method private pbkdf2(password CharSequence, salt byte[], iterations int, keyLengthInBits int) : SecretKey in class org.cryptomator.crypto.aes256.Aes256Cryptor | From | To | |
| Rename Parameter masterkey : byte[] to hMacMasterKey : byte[] in method public setHMacMasterKey(hMacMasterKey byte[]) : void in class org.cryptomator.crypto.aes256.KeyFile | From | To |