Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 23:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Made erasable keys thread-safe.

Browse Source
This commit is contained in:
akwizgran
2011-11-18 11:05:07 +00:00
parent 6fada9f243
commit 30580f71ec
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/net/sf/briar/crypto/ErasableKeyImpl.java
View File

@@ -13,8 +13,8 @@ class ErasableKeyImpl implements ErasableKey {
private final byte[] key; private final byte[] key;
private final String algorithm; private final String algorithm;
private Collection<byte[]> copies = null; private Collection<byte[]> copies = null; // Locking: this
private boolean erased = false; private boolean erased = false; // Locking: this
ErasableKeyImpl(byte[] key, String algorithm) { ErasableKeyImpl(byte[] key, String algorithm) {
this.key = key; this.key = key;
@@ -25,7 +25,7 @@ class ErasableKeyImpl implements ErasableKey {
return algorithm; return algorithm;
} }
public byte[] getEncoded() { public synchronized byte[] getEncoded() {
if(erased) throw new IllegalStateException(); if(erased) throw new IllegalStateException();
byte[] b = new byte[key.length]; byte[] b = new byte[key.length];
System.arraycopy(key, 0, b, 0, key.length); System.arraycopy(key, 0, b, 0, key.length);
@@ -42,7 +42,7 @@ class ErasableKeyImpl implements ErasableKey {
return new ErasableKeyImpl(getEncoded(), algorithm); return new ErasableKeyImpl(getEncoded(), algorithm);
} }
public void erase() { public synchronized void erase() {
if(erased) throw new IllegalStateException(); if(erased) throw new IllegalStateException();
ByteUtils.erase(key); ByteUtils.erase(key);
if(copies != null) for(byte[] b : copies) ByteUtils.erase(b); if(copies != null) for(byte[] b : copies) ByteUtils.erase(b);