Skip to content

Commit 8fb4d37

Browse files
committed
JCE: fix threaded digest tests hanging on FIPS error
Add latch.countDown() and return in catch block to prevent thread from falling through to null MessageDigest reference.
1 parent 46ff5a4 commit 8fb4d37

6 files changed

Lines changed: 12 additions & 0 deletions

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestMd5Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,8 @@ public void testMd5Threaded()
323323
NoSuchProviderException e) {
324324
/* add empty array on failure, will error out below */
325325
results.add(new byte[] {0});
326+
latch.countDown();
327+
return;
326328
}
327329

328330
/* process/update in 1024-byte chunks */

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha256Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,8 @@ public void testSha256Threaded()
312312
NoSuchProviderException e) {
313313
/* add empty array on failure, will error out below */
314314
results.add(new byte[] {0});
315+
latch.countDown();
316+
return;
315317
}
316318

317319
/* process/update in 1024-byte chunks */

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha384Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,8 @@ public void testSha384Threaded()
335335
NoSuchProviderException e) {
336336
/* add empty array on failure, will error out below */
337337
results.add(new byte[] {0});
338+
latch.countDown();
339+
return;
338340
}
339341

340342
/* process/update in 1024-byte chunks */

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha3Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,8 @@ public void testSha3Threaded()
345345
NoSuchProviderException e) {
346346
/* Add empty array on failure, will error out below */
347347
results.add(new byte[] {0});
348+
latch.countDown();
349+
return;
348350
}
349351

350352
/* Process/update in 1024-byte chunks */

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestSha512Test.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,8 @@ public void testSha512Threaded()
355355
NoSuchProviderException e) {
356356
/* add empty array on failure, will error out below */
357357
results.add(new byte[] {0});
358+
latch.countDown();
359+
return;
358360
}
359361

360362
/* process/update in 1024-byte chunks */

src/test/java/com/wolfssl/provider/jce/test/WolfCryptMessageDigestShaTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,8 @@ public void testShaThreaded()
331331
NoSuchProviderException e) {
332332
/* add empty array on failure, will error out below */
333333
results.add(new byte[] {0});
334+
latch.countDown();
335+
return;
334336
}
335337

336338
/* process/update in 1024-byte chunks */

0 commit comments

Comments
 (0)