Skip to content

Commit bab6c1a

Browse files
committed
fix: Avoid NPE when certain hash operations fail
1 parent f1ea0fe commit bab6c1a

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

TLS/src/test/java/de/rub/nds/tlsattacker/tls/crypto/TlsMessageDigestTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ public void testUpdate() {
143143
TlsMessageDigest digestTest = null;
144144
try {
145145
digestTest = new TlsMessageDigest(DigestAlgorithm.LEGACY);
146+
digestTest.setRawBytes(result);
147+
assertArrayEquals(digestTest.digest(), digresult);
146148
} catch (NoSuchAlgorithmException ex) {
147149
Logger.getLogger(TlsMessageDigestTest.class.getName()).log(Level.SEVERE, null, ex);
148150
}
149-
digestTest.setRawBytes(result);
150-
assertArrayEquals(digestTest.digest(), digresult);
151151
digest1.setRawBytes(testarray);
152152
digest1.update(testarray2); // sollte byte Array anhängen
153153
result = digest1.getRawBytes();
@@ -163,11 +163,11 @@ public void testUpdate() {
163163
digestTest = null;
164164
try {
165165
digestTest = new TlsMessageDigest(DigestAlgorithm.LEGACY);
166+
digestTest.setRawBytes(result);
167+
assertArrayEquals(digestTest.digest(), digresult);
166168
} catch (NoSuchAlgorithmException ex) {
167169
Logger.getLogger(TlsMessageDigestTest.class.getName()).log(Level.SEVERE, null, ex);
168170
}
169-
digestTest.setRawBytes(result);
170-
assertArrayEquals(digestTest.digest(), digresult);
171171
digest1.setRawBytes(testarray);
172172
int testLength = 2;
173173
int testPosition = 2;
@@ -187,11 +187,11 @@ public void testUpdate() {
187187
digestTest = null;
188188
try {
189189
digestTest = new TlsMessageDigest(DigestAlgorithm.LEGACY);
190+
digestTest.setRawBytes(result);
191+
assertArrayEquals(digestTest.digest(), digresult);
190192
} catch (NoSuchAlgorithmException ex) {
191193
Logger.getLogger(TlsMessageDigestTest.class.getName()).log(Level.SEVERE, null, ex);
192194
}
193-
digestTest.setRawBytes(result);
194-
assertArrayEquals(digestTest.digest(), digresult);
195195
}
196196

197197
/**
@@ -247,6 +247,8 @@ public void testReset() {
247247
} catch (NoSuchAlgorithmException ex) {
248248
e = ex;
249249
LOGGER.info("Could not Create default Digest with ProtocolVersion TLS10 Constructor");
250+
fail();
251+
return;
250252
}
251253
assertNull(e);
252254
digest1.digest();

0 commit comments

Comments
 (0)