Fix Qt Nightly Jenkins failure #8428
Open
+8
−0
Conversation
This file contains 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
|
Retest this please |
1 similar comment
|
Retest this please |
dgarske
approved these changes
Feb 12, 2025
julek-wolfssl
requested changes
Feb 12, 2025
Comment on lines
14460
to
14469
| } | ||
| #if defined(WOLFSSL_QT) | ||
| /* Qt handles a peer cert pushing to chain. */ | ||
| else if (ssl->options.side == WOLFSSL_SERVER_END) { | ||
| /* to be compliant with openssl | ||
| first element is kept as peer cert on server side.*/ | ||
| wolfSSL_sk_X509_pop(sk); | ||
| } | ||
| #endif | ||
| return sk; |
There was a problem hiding this comment.
Why is QT behaving differently than other OSP's? We are moving away from OSP specific changes in the compatibility layer.
There was a problem hiding this comment.
I am not sure the reason why Qt 5 does so. But, the following code in Qt5 handles it.
if (!configuration.peerCertificate.isNull() && mode == QSslSocket::SslServerMode)
configuration.peerCertificateChain.prepend(configuration.peerCertificate);
There are two same cert in the chain if reverted code doesn't exist.
There was a problem hiding this comment.
Weird but it checks out.
// tls_process_client_certificate
X509_free(s->session->peer);
s->session->peer = sk_X509_shift(sk);
s->session->verify_result = s->verify_result;
sk_X509_pop_free(s->session->peer_chain, X509_free);
s->session->peer_chain = sk;
sk = NULL;
vs
// tls_process_server_certificate
s->session->peer_chain = sk;
Please write some tests asserting this behaviour.
There was a problem hiding this comment.
And remove the WOLFSSL_QT guard.
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.
Description
Fix Qt Jenkins failure. The failure starts after PR#8345 merged.
Testing
Run Qt Jenkins test
Checklist