From a9a81f08703b6037b24724381f60f5257355813d Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 7 Dec 2011 13:37:13 +0000
Subject: [PATCH] Removed unnecessary calls to MessageDigest.reset().
---
components/net/sf/briar/protocol/AuthorFactoryImpl.java | 1 -
components/net/sf/briar/protocol/AuthorReader.java | 1 -
components/net/sf/briar/protocol/BatchReader.java | 1 -
components/net/sf/briar/protocol/GroupFactoryImpl.java | 1 -
components/net/sf/briar/protocol/GroupReader.java | 1 -
test/net/sf/briar/protocol/BatchReaderTest.java | 1 -
test/net/sf/briar/protocol/ConsumersTest.java | 4 +---
7 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/components/net/sf/briar/protocol/AuthorFactoryImpl.java b/components/net/sf/briar/protocol/AuthorFactoryImpl.java
index 15d1f6f1da..ef504758ee 100644
--- a/components/net/sf/briar/protocol/AuthorFactoryImpl.java
+++ b/components/net/sf/briar/protocol/AuthorFactoryImpl.java
@@ -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);
diff --git a/components/net/sf/briar/protocol/AuthorReader.java b/components/net/sf/briar/protocol/AuthorReader.java
index b81d5b4f2f..c59a1028d2 100644
--- a/components/net/sf/briar/protocol/AuthorReader.java
+++ b/components/net/sf/briar/protocol/AuthorReader.java
@@ -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);
diff --git a/components/net/sf/briar/protocol/BatchReader.java b/components/net/sf/briar/protocol/BatchReader.java
index de7f5e31e4..4864d6121a 100644
--- a/components/net/sf/briar/protocol/BatchReader.java
+++ b/components/net/sf/briar/protocol/BatchReader.java
@@ -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);
diff --git a/components/net/sf/briar/protocol/GroupFactoryImpl.java b/components/net/sf/briar/protocol/GroupFactoryImpl.java
index 839e138ef7..ccd719bd70 100644
--- a/components/net/sf/briar/protocol/GroupFactoryImpl.java
+++ b/components/net/sf/briar/protocol/GroupFactoryImpl.java
@@ -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);
diff --git a/components/net/sf/briar/protocol/GroupReader.java b/components/net/sf/briar/protocol/GroupReader.java
index b076ab81fe..74f24c36eb 100644
--- a/components/net/sf/briar/protocol/GroupReader.java
+++ b/components/net/sf/briar/protocol/GroupReader.java
@@ -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);
diff --git a/test/net/sf/briar/protocol/BatchReaderTest.java b/test/net/sf/briar/protocol/BatchReaderTest.java
index 6ff7bfecee..f24722a1ff 100644
--- a/test/net/sf/briar/protocol/BatchReaderTest.java
+++ b/test/net/sf/briar/protocol/BatchReaderTest.java
@@ -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());
diff --git a/test/net/sf/briar/protocol/ConsumersTest.java b/test/net/sf/briar/protocol/ConsumersTest.java
index 4c09535a77..e09595edfa 100644
--- a/test/net/sf/briar/protocol/ConsumersTest.java
+++ b/test/net/sf/briar/protocol/ConsumersTest.java
@@ -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);
--
GitLab