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

Merge branch '169-blake2' into 'master'

Browse Source 
Switch KDF from SHA-256 to Blake2. #169

The BTP spec calls for Blake2s, but there's no Java implementation available. I suggest we go with Blake2b for now. If it turns out to be a performance bottleneck on 32-bit platforms we can consider implementing Blake2s and merging it upstream.

This depends on !13.

See merge request !21
This commit is contained in:
akwizgran
2015-12-18 16:43:45 +00:00
parent a63384a91f b29ff927b0
commit a3ecd93999
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-core/src/org/briarproject/crypto/CryptoComponentImpl.java
View File

@@ -22,6 +22,7 @@ import org.spongycastle.crypto.CipherParameters;
import org.spongycastle.crypto.Digest; import org.spongycastle.crypto.Digest;
import org.spongycastle.crypto.Mac; import org.spongycastle.crypto.Mac;
import org.spongycastle.crypto.agreement.ECDHCBasicAgreement; import org.spongycastle.crypto.agreement.ECDHCBasicAgreement;
import org.spongycastle.crypto.digests.Blake2bDigest;
import org.spongycastle.crypto.digests.SHA256Digest; import org.spongycastle.crypto.digests.SHA256Digest;
import org.spongycastle.crypto.engines.AESLightEngine; import org.spongycastle.crypto.engines.AESLightEngine;
import org.spongycastle.crypto.generators.ECKeyPairGenerator; import org.spongycastle.crypto.generators.ECKeyPairGenerator;
@@ -389,18 +390,19 @@ class CryptoComponentImpl implements CryptoComponent {
// Key derivation function based on a hash function - see NIST SP 800-56A, // Key derivation function based on a hash function - see NIST SP 800-56A,
// section 5.8 // section 5.8
private byte[] hashKdf(byte[]... inputs) { private byte[] hashKdf(byte[]... inputs) {
Digest digest = new Blake2bDigest();
// The output of the hash function must be long enough to use as a key // The output of the hash function must be long enough to use as a key
MessageDigest messageDigest = getMessageDigest(); int hashLength = digest.getDigestSize();
if (messageDigest.getDigestLength() < SecretKey.LENGTH) if (hashLength < SecretKey.LENGTH) throw new IllegalStateException();
throw new IllegalStateException();
// Calculate the hash over the concatenated length-prefixed inputs // Calculate the hash over the concatenated length-prefixed inputs
byte[] length = new byte[4]; byte[] length = new byte[4];
for (byte[] input : inputs) { for (byte[] input : inputs) {
ByteUtils.writeUint32(input.length, length, 0); ByteUtils.writeUint32(input.length, length, 0);
messageDigest.update(length); digest.update(length, 0, length.length);
messageDigest.update(input); digest.update(input, 0, input.length);
} }
byte[] hash = messageDigest.digest(); byte[] hash = new byte[hashLength];
digest.doFinal(hash, 0);
// The output is the first SecretKey.LENGTH bytes of the hash // The output is the first SecretKey.LENGTH bytes of the hash
if (hash.length == SecretKey.LENGTH) return hash; if (hash.length == SecretKey.LENGTH) return hash;
byte[] truncated = new byte[SecretKey.LENGTH]; byte[] truncated = new byte[SecretKey.LENGTH];
@@ -412,12 +414,11 @@ class CryptoComponentImpl implements CryptoComponent {
// NIST SP 800-108, section 5.1 // NIST SP 800-108, section 5.1
private byte[] macKdf(SecretKey key, byte[]... inputs) { private byte[] macKdf(SecretKey key, byte[]... inputs) {
// Initialise the PRF // Initialise the PRF
Mac prf = new HMac(new SHA256Digest()); Mac prf = new HMac(new Blake2bDigest());
prf.init(new KeyParameter(key.getBytes())); prf.init(new KeyParameter(key.getBytes()));
// The output of the PRF must be long enough to use as a key // The output of the PRF must be long enough to use as a key
int macLength = prf.getMacSize(); int macLength = prf.getMacSize();
if (macLength < SecretKey.LENGTH) if (macLength < SecretKey.LENGTH) throw new IllegalStateException();
throw new IllegalStateException();
// Calculate the PRF over the concatenated length-prefixed inputs // Calculate the PRF over the concatenated length-prefixed inputs
byte[] length = new byte[4]; byte[] length = new byte[4];
for (byte[] input : inputs) { for (byte[] input : inputs) {