Skip to content

Comments

Clang format head#29242

Closed
bob-beck wants to merge 2 commits intoopenssl:masterfrom
bob-beck:clang-format-head
Closed

Clang format head#29242
bob-beck wants to merge 2 commits intoopenssl:masterfrom
bob-beck:clang-format-head

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 contains the changes in the preparatory commit pr ( #29241 ) 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.

1741

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

@bob-beck bob-beck added the style: waived exempted from style checks label Nov 27, 2025
@bob-beck bob-beck force-pushed the clang-format-head branch 2 times, most recently from 0cb397a to b21a693 Compare November 27, 2025 21:30
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Nov 27, 2025
@bob-beck
Copy link
Contributor Author

grumph.. how the heck is the sparc64v9 perlasm breaking? I don't think this touches any of that.

@bob-beck
Copy link
Contributor Author

grumph.. how the heck is the sparc64v9 perlasm breaking? I don't think this touches any of that.

Oh god, I found it. Going to get garlic, stakes and holy water. pray for me.

@npajkovsky
Copy link

Do we really want this style?

 int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-                                  unsigned char *data, int len);
+    unsigned char *data, int len);

I would definitely tweak this option.

@levitte
Copy link
Member

levitte commented Dec 1, 2025

Please also consider #28691 (comment)

@bob-beck bob-beck force-pushed the clang-format-head branch 3 times, most recently from d894169 to 528c18d Compare December 5, 2025 21:40
@nhorman nhorman added severity: urgent Fixes an urgent issue (exempt from 24h grace period) and removed severity: urgent Fixes an urgent issue (exempt from 24h grace period) labels Dec 9, 2025
@nhorman nhorman marked this pull request as ready for review December 9, 2025 08:14
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 the approval: done This pull request has the required number of approvals label Dec 9, 2025
@nhorman nhorman added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals 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 #29242)
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 #29242)
@nhorman
Copy link
Contributor

nhorman commented Dec 9, 2025

merged to master, thank you all!

@nhorman nhorman closed this Dec 9, 2025
cxx194832 pushed a commit to cxx194832/openssl that referenced this pull request Dec 12, 2025
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Reviewed-by: Nikola Pajkovsky <[email protected]>
(Merged from openssl#29242)
cxx194832 pushed a commit to cxx194832/openssl that referenced this pull request Dec 12, 2025
Reviewed-by: Saša Nedvědický <[email protected]>
Reviewed-by: Neil Horman <[email protected]>
Reviewed-by: Nikola Pajkovsky <[email protected]>
(Merged from openssl#29242)
MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) ||
MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) &&
(OPENSSL_armcap_P & ARMV8_SHA3))
if ((MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_QCOMM, QCOM_CPU_PART_ORYON_X1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_MICROSOFT, MICROSOFT_CPU_PART_COBALT_100) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V2) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N3) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3_AE) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V3) || MIDR_IMPLEMENTER(OPENSSL_arm_midr) == ARM_CPU_IMP_AMPERE) && (OPENSSL_armcap_P & ARMV8_SHA3))
Copy link
Contributor

Choose a reason for hiding this comment

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

These super long lines are now unreadable :/

Copy link
Contributor

Choose a reason for hiding this comment

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge severity: fips change The pull request changes FIPS provider sources style: waived exempted from style checks

Projects

None yet

Development

Successfully merging this pull request may close these issues.

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

6 participants