Skip to content

Comments

Clang format 3.6#29245

Closed
bob-beck wants to merge 2 commits intoopenssl:openssl-3.6from
bob-beck:clang-format-3.6
Closed

Clang format 3.6#29245
bob-beck wants to merge 2 commits intoopenssl:openssl-3.6from
bob-beck:clang-format-3.6

Conversation

@bob-beck
Copy link
Contributor

@bob-beck bob-beck commented Nov 27, 2025

This will be the day-of-change PR - it will remain draft until that day as it will be constantly
redone to test until the tree is frozen

It is based on and contains the changes in the preparatory commit pr ( #29243 ) and will be rebased
once that lands.

The last four commits in this stack is what will be left. On the day of, I believe the first two should
be merged, then the last two should be squashed together and merged as one.

The reason for squashing the last two is to get one commit hash that then must be added to
the top level .git-blame-ignore-revs, as this will be the reformatting commit nobody wants
to see in git blame.

For 1741
!--
Thank you for your pull request. Please review these requirements:

Contributors guide: https://github.com/openssl/openssl/blob/master/CONTRIBUTING.md

Other than that, provide a description above this comment if there isn't one already

If this fixes a GitHub issue, make sure to have a line saying 'Fixes #XXXX' (without quotes) in the commit message.
-->

Checklist
  • documentation is added or updated
  • tests are added or updated

@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Nov 27, 2025
- "ASN1_CHOICE_END_cb"
- "ASN1_CHOICE_END_name"
- "ASN1_CHOICE_END_selector"
- "ASN1_F_ASN1_FIND_END 0"
Copy link
Member

Choose a reason for hiding this comment

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

?

@nhorman nhorman marked this pull request as ready for review December 9, 2025 08:51
Copy link
Contributor

@Sashan Sashan left a comment

Choose a reason for hiding this comment

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

looks good to me.

@Sashan Sashan added approval: done This pull request has the required number of approvals approval: ready to merge The 24 hour grace period has passed, ready to merge branch: 3.6 Applies to openssl-3.6 labels Dec 9, 2025
openssl-machine pushed a commit that referenced this pull request Dec 9, 2025
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Reviewed-by: Nikola Pajkovsky <[email protected]>
(Merged from #29245)
openssl-machine pushed a commit that referenced this pull request Dec 9, 2025
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Reviewed-by: Nikola Pajkovsky <[email protected]>
(Merged from #29245)
@nhorman
Copy link
Contributor

nhorman commented Dec 9, 2025

merged to 3.6, thank you!

@nhorman nhorman closed this Dec 9, 2025
openssl-machine pushed a commit that referenced this pull request Jan 27, 2026
3.6.1 CHANGES.md includes the following:
 * #28760
   "Improve the CPUINFO display for RISC-V"
 * #28797
   "Fix regression when X509_V_FLAG_CRL_CHECK_ALL is set"
 * #28955
   "Fix for TLS handshake issue with GnuTLS #28902"
 * #29155
   "fix(x509.c): fixed -checkend return values"
 * #29214
   "s390x: Check and fail on invalid malformed ECDSA signatures"
 * #29245
   "Clang format 3.6"
 * #29251
   "Fix change of behavior of the single stapled OCSP response API"

3.6.1 NEWS.md includes the following:
 * #28797
   "Fix regression when X509_V_FLAG_CRL_CHECK_ALL is set"
 * #28955
   "Fix for TLS handshake issue with GnuTLS #28902"

Co-Authored-by: Tomáš Mráz <[email protected]>
Signed-off-by: Eugene Syromiatnikov <[email protected]>

Reviewed-by: Nikola Pajkovsky <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
MergeDate: Mon Jan 26 20:01:30 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: done This pull request has the required number of approvals approval: ready to merge The 24 hour grace period has passed, ready to merge branch: 3.6 Applies to openssl-3.6 severity: fips change The pull request changes FIPS provider sources

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Freeze/Unfreeze tree and land clang-format changes Dec 9.

5 participants