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

Log the running time of key validation and message verification.

Browse Source
This commit is contained in:
akwizgran
2014-03-22 00:30:29 +00:00
parent d83513c5f9
commit fc66f6ed8a
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
briar-core/src/org/briarproject/crypto/Sec1KeyParser.java
View File

@@ -1,7 +1,10 @@
package org.briarproject.crypto; package org.briarproject.crypto;
import static java.util.logging.Level.INFO;
import java.math.BigInteger; import java.math.BigInteger;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.util.logging.Logger;
import org.briarproject.api.crypto.KeyParser; import org.briarproject.api.crypto.KeyParser;
import org.briarproject.api.crypto.PrivateKey; import org.briarproject.api.crypto.PrivateKey;
@@ -19,6 +22,9 @@ import org.spongycastle.math.ec.ECPoint;
*/ */
class Sec1KeyParser implements KeyParser { class Sec1KeyParser implements KeyParser {
private static final Logger LOG =
Logger.getLogger(Sec1KeyParser.class.getName());
private final ECDomainParameters params; private final ECDomainParameters params;
private final BigInteger modulus; private final BigInteger modulus;
private final int keyBits, bytesPerInt, publicKeyBytes, privateKeyBytes; private final int keyBits, bytesPerInt, publicKeyBytes, privateKeyBytes;
@@ -36,6 +42,7 @@ class Sec1KeyParser implements KeyParser {
throws GeneralSecurityException { throws GeneralSecurityException {
// The validation procedure comes from SEC 1, section 3.2.2.1. Note // The validation procedure comes from SEC 1, section 3.2.2.1. Note
// that SEC 1 parameter names are used below, not RFC 5639 names // that SEC 1 parameter names are used below, not RFC 5639 names
long now = System.currentTimeMillis();
if(encodedKey.length != publicKeyBytes) if(encodedKey.length != publicKeyBytes)
throw new GeneralSecurityException(); throw new GeneralSecurityException();
// The first byte must be 0x04 // The first byte must be 0x04
@@ -66,11 +73,16 @@ class Sec1KeyParser implements KeyParser {
throw new GeneralSecurityException(); throw new GeneralSecurityException();
// Construct a public key from the point (x, y) and the params // Construct a public key from the point (x, y) and the params
ECPublicKeyParameters k = new ECPublicKeyParameters(pub, params); ECPublicKeyParameters k = new ECPublicKeyParameters(pub, params);
return new Sec1PublicKey(k, keyBits); PublicKey p = new Sec1PublicKey(k, keyBits);
long duration = System.currentTimeMillis() - now;
if(LOG.isLoggable(INFO))
LOG.info("Parsing public key took " + duration + " ms");
return p;
} }
public PrivateKey parsePrivateKey(byte[] encodedKey) public PrivateKey parsePrivateKey(byte[] encodedKey)
throws GeneralSecurityException { throws GeneralSecurityException {
long now = System.currentTimeMillis();
if(encodedKey.length != privateKeyBytes) if(encodedKey.length != privateKeyBytes)
throw new GeneralSecurityException(); throw new GeneralSecurityException();
BigInteger d = new BigInteger(1, encodedKey); // Positive signum BigInteger d = new BigInteger(1, encodedKey); // Positive signum
@@ -79,6 +91,10 @@ class Sec1KeyParser implements KeyParser {
throw new GeneralSecurityException(); throw new GeneralSecurityException();
// Construct a private key from the private value and the params // Construct a private key from the private value and the params
ECPrivateKeyParameters k = new ECPrivateKeyParameters(d, params); ECPrivateKeyParameters k = new ECPrivateKeyParameters(d, params);
return new Sec1PrivateKey(k, keyBits); PrivateKey p = new Sec1PrivateKey(k, keyBits);
long duration = System.currentTimeMillis() - now;
if(LOG.isLoggable(INFO))
LOG.info("Parsing private key took " + duration + " ms");
return p;
} }
} }

19
briar-core/src/org/briarproject/messaging/MessageVerifierImpl.java
View File

@@ -1,8 +1,10 @@
package org.briarproject.messaging; package org.briarproject.messaging;
import static java.util.logging.Level.INFO;
import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE; import static org.briarproject.api.transport.TransportConstants.MAX_CLOCK_DIFFERENCE;
import java.security.GeneralSecurityException; import java.security.GeneralSecurityException;
import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
@@ -20,6 +22,9 @@ import org.briarproject.api.system.Clock;
class MessageVerifierImpl implements MessageVerifier { class MessageVerifierImpl implements MessageVerifier {
private static final Logger LOG =
Logger.getLogger(MessageVerifierImpl.class.getName());
private final CryptoComponent crypto; private final CryptoComponent crypto;
private final Clock clock; private final Clock clock;
private final KeyParser keyParser; private final KeyParser keyParser;
@@ -33,11 +38,11 @@ class MessageVerifierImpl implements MessageVerifier {
public Message verifyMessage(UnverifiedMessage m) public Message verifyMessage(UnverifiedMessage m)
throws GeneralSecurityException { throws GeneralSecurityException {
long now = System.currentTimeMillis();
MessageDigest messageDigest = crypto.getMessageDigest(); MessageDigest messageDigest = crypto.getMessageDigest();
Signature signature = crypto.getSignature(); Signature signature = crypto.getSignature();
// Reject the message if it's too far in the future // Reject the message if it's too far in the future
long now = clock.currentTimeMillis(); if(m.getTimestamp() > clock.currentTimeMillis() + MAX_CLOCK_DIFFERENCE)
if(m.getTimestamp() > now + MAX_CLOCK_DIFFERENCE)
throw new GeneralSecurityException(); throw new GeneralSecurityException();
// Hash the message to get the message ID // Hash the message to get the message ID
byte[] raw = m.getSerialised(); byte[] raw = m.getSerialised();
@@ -52,8 +57,12 @@ class MessageVerifierImpl implements MessageVerifier {
if(!signature.verify(m.getSignature())) if(!signature.verify(m.getSignature()))
throw new GeneralSecurityException(); throw new GeneralSecurityException();
} }
return new MessageImpl(id, m.getParent(), m.getGroup(), author, Message verified = new MessageImpl(id, m.getParent(), m.getGroup(),
m.getContentType(), m.getTimestamp(), raw, m.getBodyStart(), author, m.getContentType(), m.getTimestamp(), raw,
m.getBodyLength()); m.getBodyStart(), m.getBodyLength());
long duration = System.currentTimeMillis() - now;
if(LOG.isLoggable(INFO))
LOG.info("Verifying message took " + duration + " ms");
return verified;
} }
} }