JSSE/JNI: wantClientAuth cert validation and RsaVerify callback exception fixes#381
Open
cconlon wants to merge 2 commits into
Open
JSSE/JNI: wantClientAuth cert validation and RsaVerify callback exception fixes#381cconlon wants to merge 2 commits into
cconlon wants to merge 2 commits into
Conversation
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.
This PR fixes two Fenrir issues related to certificate and callback handling.
F-6307: validate presented client certs under wantClientAuth
WolfSSLInternalVerifyCb.verifyCallback()was calling the TrustManager for a presented client certificate underwantClientAuth(true)/needClientAuth(false)but discarding the result, so a client certificate that failed validation was accepted and the handshake continued. This changes that path to abort the handshake (return failure) when the TrustManager rejects a presented cert.wantClientAuthnow only makes an absent client certificate non-fatal. A certificate that is presented must still validate. This matches SunJSSE. The absent-cert path is unchanged, so optional client auth without a cert still succeeds.F-3912: return failure from NativeRsaVerifyCb on Java callback exception
When the Java RSA verify PK callback threw,
NativeRsaVerifyCbdetected and cleared the exception but continued with an undefinedretval(per the JNI spec) and leaked its local refs. It now deletes the local refs and returns failure on exception, matching the siblingNativeRsaSignCb/NativeEccVerifyCbcallbacks. Compiled underHAVE_PK_CALLBACKS.