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

Removed unnecessary calls to MessageDigest.reset().

Browse Source
This commit is contained in:
akwizgran
2011-12-07 13:37:13 +00:00
parent 1c41ffa7af
commit a9a81f0870
7 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/net/sf/briar/protocol/AuthorFactoryImpl.java
View File

@@ -33,7 +33,6 @@ class AuthorFactoryImpl implements AuthorFactory {
w.writeString(name);
w.writeBytes(publicKey);
MessageDigest messageDigest = crypto.getMessageDigest();
messageDigest.reset();
messageDigest.update(out.toByteArray());
AuthorId id = new AuthorId(messageDigest.digest());
return new AuthorImpl(id, name, publicKey);

1
components/net/sf/briar/protocol/AuthorReader.java
View File

@@ -26,7 +26,6 @@ class AuthorReader implements ObjectReader<Author> {
public Author readObject(Reader r) throws IOException {
// Initialise the consumer
DigestingConsumer digesting = new DigestingConsumer(messageDigest);
messageDigest.reset();
// Read and digest the data
r.addConsumer(digesting);
r.readStructId(Types.AUTHOR);

1
components/net/sf/briar/protocol/BatchReader.java
View File

@@ -35,7 +35,6 @@ class BatchReader implements ObjectReader<UnverifiedBatch> {
Consumer counting =
new CountingConsumer(ProtocolConstants.MAX_PACKET_LENGTH);
DigestingConsumer digesting = new DigestingConsumer(messageDigest);
messageDigest.reset();
// Read and digest the data
r.addConsumer(counting);
r.addConsumer(digesting);

1
components/net/sf/briar/protocol/GroupFactoryImpl.java
View File

@@ -33,7 +33,6 @@ class GroupFactoryImpl implements GroupFactory {
if(publicKey == null) w.writeNull();
else w.writeBytes(publicKey);
MessageDigest messageDigest = crypto.getMessageDigest();
messageDigest.reset();
messageDigest.update(out.toByteArray());
GroupId id = new GroupId(messageDigest.digest());
return new GroupImpl(id, name, publicKey);

1
components/net/sf/briar/protocol/GroupReader.java
View File

@@ -26,7 +26,6 @@ class GroupReader implements ObjectReader<Group> {
public Group readObject(Reader r) throws IOException {
// Initialise the consumer
DigestingConsumer digesting = new DigestingConsumer(messageDigest);
messageDigest.reset();
// Read and digest the data
r.addConsumer(digesting);
r.readStructId(Types.GROUP);

1
test/net/sf/briar/protocol/BatchReaderTest.java
View File

@@ -96,7 +96,6 @@ public class BatchReaderTest extends TestCase {
byte[] b = createBatch(ProtocolConstants.MAX_PACKET_LENGTH);
// Calculate the expected batch ID
MessageDigest messageDigest = crypto.getMessageDigest();
messageDigest.reset();
messageDigest.update(b);
final BatchId id = new BatchId(messageDigest.digest());

4
test/net/sf/briar/protocol/ConsumersTest.java
View File

@@ -31,15 +31,13 @@ public class ConsumersTest extends TestCase {
@Test
public void testDigestingConsumer() throws Exception {
MessageDigest messageDigest = crypto.getMessageDigest();
byte[] data = new byte[1234];
// Generate some random data and digest it
new Random().nextBytes(data);
messageDigest.reset();
MessageDigest messageDigest = crypto.getMessageDigest();
messageDigest.update(data);
byte[] dig = messageDigest.digest();
// Check that feeding a DigestingConsumer generates the same digest
messageDigest.reset();
DigestingConsumer dc = new DigestingConsumer(messageDigest);
dc.write(data[0]);
dc.write(data, 1, data.length - 2);