sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made setting aes keys in DownloadableFile more readable

This commit is contained in:
Daniel Gultsch 2016-03-31 13:55:25 +02:00
parent d115f38361
commit 343a6b4e6b
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
View File

@ -52,20 +52,16 @@ public class DownloadableFile extends File {
public void setKeyAndIv(byte[] keyIvCombo) { public void setKeyAndIv(byte[] keyIvCombo) {
if (keyIvCombo.length == 48) { if (keyIvCombo.length == 48) {
byte[] secretKey = new byte[32]; this.aeskey = new byte[32];
byte[] iv = new byte[16]; this.iv = new byte[16];
System.arraycopy(keyIvCombo, 0, iv, 0, 16); System.arraycopy(keyIvCombo, 0, this.iv, 0, 16);
System.arraycopy(keyIvCombo, 16, secretKey, 0, 32); System.arraycopy(keyIvCombo, 16, this.aeskey, 0, 32);
this.aeskey = secretKey;
this.iv = iv;
} else if (keyIvCombo.length >= 32) { } else if (keyIvCombo.length >= 32) {
byte[] secretKey = new byte[32]; this.aeskey = new byte[32];
System.arraycopy(keyIvCombo, 0, secretKey, 0, 32); System.arraycopy(keyIvCombo, 0, aeskey, 0, 32);
this.aeskey = secretKey;
} else if (keyIvCombo.length >= 16) { } else if (keyIvCombo.length >= 16) {
byte[] secretKey = new byte[16]; this.aeskey = new byte[16];
System.arraycopy(keyIvCombo, 0, secretKey, 0, 16); System.arraycopy(keyIvCombo, 0, this.aeskey, 0, 16);
this.aeskey = secretKey;
} }
} }