Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fips: use tsan counter instead of tsan_add to increment #21199

Closed
wants to merge 1 commit into from
Closed

fips: use tsan counter instead of tsan_add to increment #21199

wants to merge 1 commit into from

Conversation

paulidale
Copy link
Contributor

This change was required when merging to 3.0 (tsan_add doesn't exist there).
Might as well make the same change on master and 3.1 as well.

I'd forgotten about tsan_counter 馃槩

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

@paulidale paulidale added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member branch: 3.1 Merge to openssl-3.1 tests: exempted The PR is exempt from requirements for testing labels Jun 14, 2023
@paulidale paulidale self-assigned this Jun 14, 2023
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Jun 14, 2023
@t8m t8m added the triaged: refactor The issue/pr requests/implements refactoring label Jun 14, 2023
t8m
t8m approved these changes Jun 14, 2023
View reviewed changes
Copy link
Member

@t8m t8m left a comment

Choose a reason for hiding this comment

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

To align the code in all branches ok also for 3.1.

@t8m t8m removed the approval: otc review pending This pull request needs review by an OTC member label Jun 14, 2023
@paulidale
Copy link
Contributor Author

ping @openssl/committers for 2nd review

@slontis slontis added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Jun 15, 2023
@slontis
Copy link
Member

slontis commented Jun 15, 2023

Add label for 3.0?

@slontis
Copy link
Member

slontis commented Jun 15, 2023

Ahh its already merged?

@paulidale
Copy link
Contributor Author

I had to apply this change as a fix when I merged the TSAN change to 3.0.
This PR is bringing 3.1 and master into line with what's in 3.0.

@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually.

@paulidale
Copy link
Contributor Author

Merged, thanks for the reviews.

@paulidale paulidale closed this Jun 16, 2023
openssl-machine pushed a commit that referenced this pull request Jun 16, 2023
@paulidale
fips: use tsan counter instead of tsan_add to increment
ff934cf 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from #21199)
openssl-machine pushed a commit that referenced this pull request Jun 16, 2023
@paulidale
fips: use tsan counter instead of tsan_add to increment
41e5249 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from #21199)

(cherry picked from commit ff934cf)
@paulidale paulidale deleted the fips-tsan-add branch June 28, 2023 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t8m t8m t8m approved these changes

@slontis slontis slontis approved these changes

Assignees

@paulidale paulidale

Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch branch: 3.1 Merge to openssl-3.1 severity: fips change The pull request changes FIPS provider sources tests: exempted The PR is exempt from requirements for testing triaged: refactor The issue/pr requests/implements refactoring
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@paulidale @slontis @openssl-machine @t8m