Skip to content

add back WOLFSSL_QT macro guard for get cipher name behavior#9997

Open
JacobBarthelmeh wants to merge 1 commit intowolfSSL:masterfrom
JacobBarthelmeh:qt
Open

add back WOLFSSL_QT macro guard for get cipher name behavior#9997
JacobBarthelmeh wants to merge 1 commit intowolfSSL:masterfrom
JacobBarthelmeh:qt

Conversation

@JacobBarthelmeh
Copy link
Contributor

@JacobBarthelmeh JacobBarthelmeh commented Mar 17, 2026

This adds back in the WOLFSSL_QT guard that was removed in #9831

@JacobBarthelmeh JacobBarthelmeh self-assigned this Mar 17, 2026
Copilot AI review requested due to automatic review settings March 17, 2026 22:37
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Re-introduces the WOLFSSL_QT macro guard so that Qt builds use the OPENSSL_ALL-style cipher suite ordering/stack handling in wolfSSL_get_ciphers_compat().

Changes:

  • Extend OPENSSL_ALL preprocessor checks to also include WOLFSSL_QT for cipher-name table access.
  • Apply the same OPENSSL_ALL/Qt conditional behavior to cipher suite iteration order (priority ordering).
  • Apply the same OPENSSL_ALL/Qt conditional behavior to cipher.in_stack handling.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

@JacobBarthelmeh JacobBarthelmeh changed the title add back WOLFSSL_QT macro guard for order of cipher suites add back WOLFSSL_QT macro guard for get cipher name behavior Mar 17, 2026
@JacobBarthelmeh JacobBarthelmeh requested a review from Copilot March 17, 2026 23:49
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Reintroduces the WOLFSSL_QT preprocessor guard so Qt builds use the non-IANA cipher name path, restoring behavior removed in #9831.

Changes:

  • Gate wolfSSL_CIPHER_get_name() IANA-name behavior behind !defined(WOLFSSL_QT).
  • Update API tests to expect IANA cipher naming only when WOLFSSL_QT is not defined.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File Description
tests/api.c Adjusts cipher-name assertions to account for WOLFSSL_QT builds using a different naming path.
src/ssl.c Restores WOLFSSL_QT guard to select non-IANA cipher name behavior for Qt builds.
Comments suppressed due to low confidence (1)

tests/api.c:1

  • This #if line continuation/indentation is inconsistent with the earlier updated block in this file (which wraps the WOLFSSL_QT check onto its own aligned continuation line). For readability and to keep preprocessor conditions consistent, wrap/indent this condition the same way as the other occurrence.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

@JacobBarthelmeh
Copy link
Contributor Author

Retest this please Jenkins

@miyazakh miyazakh mentioned this pull request Mar 18, 2026
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants