Skip to content

Commit e593e63

Browse files
committed
update test to catch expected statuses
1 parent 3dfbaa1 commit e593e63

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

src/test/com/wolfssl/provider/jsse/test/WolfSSLEngineTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3147,9 +3147,12 @@ public void testHandshakeUnwrapConsumedNotBufferUnderflow()
31473147
result = client.unwrap(firstHalf, cliAppBuf);
31483148

31493149
/* BUFFER_UNDERFLOW must not be returned when input was
3150-
* consumed - regression for inRemaining == 0 guard fix */
3150+
* consumed - regression for inRemaining == 0 guard fix.
3151+
* If BUFFER_UNDERFLOW is returned, bytesConsumed() must be 0
3152+
* per the JSSE spec ("No data was consumed"). */
31513153
if (result.getStatus() ==
3152-
SSLEngineResult.Status.BUFFER_UNDERFLOW) {
3154+
SSLEngineResult.Status.BUFFER_UNDERFLOW &&
3155+
result.bytesConsumed() > 0) {
31533156
error("\t... failed");
31543157
fail("unwrap() with consumed handshake data must not " +
31553158
"return BUFFER_UNDERFLOW (regression: inRemaining" +
@@ -3159,7 +3162,8 @@ public void testHandshakeUnwrapConsumedNotBufferUnderflow()
31593162

31603163
/* Input was non-empty so at least some bytes must have
31613164
* been consumed */
3162-
if (result.bytesConsumed() == 0) {
3165+
if (result.getStatus() != SSLEngineResult.Status.BUFFER_UNDERFLOW
3166+
&& result.bytesConsumed() == 0) {
31633167
error("\t... failed");
31643168
fail("unwrap() consumed 0 bytes from a non-empty " +
31653169
"handshake buffer");

0 commit comments

Comments
 (0)