Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Erase temporary copies of keys.

Browse Source
This commit is contained in:
akwizgran
2013-07-12 18:53:15 +01:00
parent e9859e9f38
commit a2fffedc64
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-core/src/net/sf/briar/crypto/CryptoComponentImpl.java
View File

@@ -293,8 +293,11 @@ class CryptoComponentImpl implements CryptoComponent {
for(int i = 0; i < TAG_LENGTH; i++) tag[i] = 0; for(int i = 0; i < TAG_LENGTH; i++) tag[i] = 0;
ByteUtils.writeUint32(connection, tag, 0); ByteUtils.writeUint32(connection, tag, 0);
BlockCipher cipher = new AESFastEngine(); BlockCipher cipher = new AESFastEngine();
cipher.init(true, new KeyParameter(tagKey.getEncoded())); assert cipher.getBlockSize() == TAG_LENGTH;
KeyParameter k = new KeyParameter(tagKey.getEncoded());
cipher.init(true, k);
cipher.processBlock(tag, 0, tag, 0); cipher.processBlock(tag, 0, tag, 0);
ByteUtils.erase(k.getKey());
} }
public byte[] encryptWithPassword(byte[] input, char[] password) { public byte[] encryptWithPassword(byte[] input, char[] password) {
@@ -403,7 +406,8 @@ class CryptoComponentImpl implements CryptoComponent {
if(label[label.length - 1] != '\0') if(label[label.length - 1] != '\0')
throw new IllegalArgumentException(); throw new IllegalArgumentException();
Mac prf = new CMac(new AESFastEngine()); Mac prf = new CMac(new AESFastEngine());
prf.init(new KeyParameter(secret)); KeyParameter k = new KeyParameter(secret);
prf.init(k);
int macLength = prf.getMacSize(); int macLength = prf.getMacSize();
byte[] mac = new byte[macLength], output = new byte[CIPHER_KEY_BYTES]; byte[] mac = new byte[macLength], output = new byte[CIPHER_KEY_BYTES];
byte[] contextBytes = new byte[4]; byte[] contextBytes = new byte[4];
@@ -419,6 +423,7 @@ class CryptoComponentImpl implements CryptoComponent {
System.arraycopy(mac, 0, output, i * macLength, bytesToUse); System.arraycopy(mac, 0, output, i * macLength, bytesToUse);
ByteUtils.erase(mac); ByteUtils.erase(mac);
} }
ByteUtils.erase(k.getKey());
return output; return output;
} }