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

Moved Bytes to the main package. Added a SharedSecret class to parse

Browse Source 
encrypted secrets retrieved from the database.
This commit is contained in:
akwizgran
2011-08-11 19:14:20 +01:00
parent df972e294d
commit 7545a1cc8f
8 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/net/sf/briar/api/serial/Bytes.java → api/net/sf/briar/api/Bytes.java
View File

@@ -1,4 +1,4 @@
package net.sf.briar.api.serial;
package net.sf.briar.api;
import java.util.Arrays;

6
api/net/sf/briar/api/crypto/CryptoComponent.java
View File

@@ -10,11 +10,11 @@ import javax.crypto.SecretKey;
public interface CryptoComponent {
SecretKey deriveMacKey(byte[] secret, boolean alice);
SecretKey deriveMacKey(byte[] secret);
SecretKey derivePacketKey(byte[] secret, boolean alice);
SecretKey derivePacketKey(byte[] secret);
SecretKey deriveTagKey(byte[] secret, boolean alice);
SecretKey deriveTagKey(byte[] secret);
KeyPair generateKeyPair();

36
components/net/sf/briar/crypto/CryptoComponentImpl.java
View File

@@ -68,33 +68,31 @@ class CryptoComponentImpl implements CryptoComponent {
}
}
public SecretKey deriveMacKey(byte[] secret, boolean alice) {
if(alice) return deriveKey("MACA", secret);
else return deriveKey("MACB", secret);
public SecretKey deriveMacKey(byte[] secret) {
SharedSecret s = new SharedSecret(secret);
if(s.getAlice()) return deriveKey("MACA", s.getIv(), s.getCiphertext());
else return deriveKey("MACB", s.getIv(), s.getCiphertext());
}
private SecretKey deriveKey(String name, byte[] secret) {
private SecretKey deriveKey(String name, IvParameterSpec iv,
byte[] ciphertext) {
MessageDigest digest = getMessageDigest();
try {
digest.update(name.getBytes("UTF-8"));
} catch(UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
byte[] decrypted = decryptSharedSecret(secret);
byte[] decrypted = decryptSharedSecret(iv, ciphertext);
digest.update(decrypted);
Arrays.fill(decrypted, (byte) 0);
Arrays.fill(decrypted, (byte) 0); // Destroy the plaintext secret
return new SecretKeySpec(digest.digest(), SECRET_KEY_ALGO);
}
private byte[] decryptSharedSecret(byte[] secret) {
// The first 16 bytes of the stored secret are the IV
if(secret.length <= 16) throw new IllegalArgumentException();
IvParameterSpec iv = new IvParameterSpec(secret, 0, 16);
private byte[] decryptSharedSecret(IvParameterSpec iv, byte[] ciphertext) {
try {
// Decrypt and return the remainder of the stored secret
Cipher c = Cipher.getInstance(SECRET_STORAGE_ALGO, PROVIDER);
c.init(Cipher.DECRYPT_MODE, secretStorageKey, iv);
return c.doFinal(secret, 16, secret.length - 16);
return c.doFinal(ciphertext);
} catch(BadPaddingException e) {
throw new RuntimeException(e);
} catch(IllegalBlockSizeException e) {
@@ -112,14 +110,16 @@ class CryptoComponentImpl implements CryptoComponent {
}
}
public SecretKey derivePacketKey(byte[] secret, boolean alice) {
if(alice) return deriveKey("PKTA", secret);
else return deriveKey("PKTB", secret);
public SecretKey derivePacketKey(byte[] secret) {
SharedSecret s = new SharedSecret(secret);
if(s.getAlice()) return deriveKey("PKTA", s.getIv(), s.getCiphertext());
else return deriveKey("PKTB", s.getIv(), s.getCiphertext());
}
public SecretKey deriveTagKey(byte[] secret, boolean alice) {
if(alice) return deriveKey("TAGA", secret);
else return deriveKey("TAGB", secret);
public SecretKey deriveTagKey(byte[] secret) {
SharedSecret s = new SharedSecret(secret);
if(s.getAlice()) return deriveKey("TAGA", s.getIv(), s.getCiphertext());
else return deriveKey("TAGB", s.getIv(), s.getCiphertext());
}
public KeyPair generateKeyPair() {

42
components/net/sf/briar/crypto/SharedSecret.java Normal file
View File

@@ -0,0 +1,42 @@
package net.sf.briar.crypto;
import java.util.Arrays;
import javax.crypto.spec.IvParameterSpec;
class SharedSecret {
private static final int IV_BYTES = 16;
private final IvParameterSpec iv;
private final boolean alice;
private final byte[] ciphertext;
SharedSecret(byte[] secret) {
if(secret.length < IV_BYTES + 2) throw new IllegalArgumentException();
iv = new IvParameterSpec(secret, 0, IV_BYTES);
switch(secret[IV_BYTES]) {
case 0:
alice = false;
break;
case 1:
alice = true;
break;
default:
throw new IllegalArgumentException();
}
ciphertext = Arrays.copyOfRange(secret, IV_BYTES + 1, secret.length);
}
IvParameterSpec getIv() {
return iv;
}
boolean getAlice() {
return alice;
}
byte[] getCiphertext() {
return ciphertext;
}
}

2
components/net/sf/briar/serial/ReaderImpl.java
View File

@@ -8,7 +8,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.sf.briar.api.serial.Bytes;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.FormatException;
import net.sf.briar.api.serial.ObjectReader;

2
components/net/sf/briar/serial/WriterImpl.java
View File

@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import net.sf.briar.api.serial.Bytes;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.serial.Tag;
import net.sf.briar.api.serial.Writable;
import net.sf.briar.api.serial.Writer;

2
test/net/sf/briar/crypto/CounterModeTest.java
View File

@@ -11,7 +11,7 @@ import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import junit.framework.TestCase;
import net.sf.briar.api.serial.Bytes;
import net.sf.briar.api.Bytes;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.junit.Test;

2
test/net/sf/briar/serial/ReaderImplTest.java
View File

@@ -9,10 +9,10 @@ import java.util.Map;
import java.util.Map.Entry;
import junit.framework.TestCase;
import net.sf.briar.api.Bytes;
import net.sf.briar.api.serial.Consumer;
import net.sf.briar.api.serial.FormatException;
import net.sf.briar.api.serial.ObjectReader;
import net.sf.briar.api.serial.Bytes;
import net.sf.briar.api.serial.Reader;
import net.sf.briar.util.StringUtils;