JSSE: check if inRemaining == 0#351
Merged
cconlon merged 2 commits intowolfSSL:masterfrom Apr 6, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR refines wolfJSSE SSLEngine.unwrap() status mapping to avoid returning BUFFER_UNDERFLOW when the caller did provide input bytes (but those bytes were consumed and native wolfSSL still needs more ciphertext). It also adds a regression test covering this specific “consumed input but still WANT_READ” handshake scenario in TLS 1.3.
Changes:
- Tighten the
BUFFER_UNDERFLOWdetection condition by additionally requiringinRemaining == 0(no bytes supplied at unwrap entry). - Add a TLS 1.3 regression test ensuring
unwrap()does not returnBUFFER_UNDERFLOWwhen it consumed non-empty handshake input.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java |
Adds inRemaining == 0 guard to restrict BUFFER_UNDERFLOW to the “no input provided” case. |
src/test/com/wolfssl/provider/jsse/test/WolfSSLEngineTest.java |
Adds regression test testHandshakeUnwrapConsumedNotBufferUnderflow() for the adjusted unwrap-status behavior in TLS 1.3. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
cconlon
approved these changes
Apr 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a check for
inRemaining == 0when detecting if status needs to be set toBUFFER_UNDERFLOW.inRemainingis the input buffer size at unwrap entry, while in.remaining() is after processing. Requiring both to be 0 limits this path to the “no bytes were supplied this call” case. Avoids “all supplied bytes were consumed but more ciphertext is still needed” case being handled the same way.Adds regression test
testHandshakeUnwrapConsumedNotBufferUnderflow().Fixes SunJSSE ServerName tests: ServerName/SSLEngineExplorerMatchedSNI.java, ServerName/SSLEngineExplorerWithCli.java, ServerName/SSLEngineExplorerWithSrv.java