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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes to resolve the symbol conflict because of gf_mul #21421

Closed
wants to merge 1 commit into from
Closed

Changes to resolve the symbol conflict because of gf_mul #21421

wants to merge 1 commit into from

Conversation

Pankul94
Copy link
Contributor

@Pankul94 Pankul94 commented Jul 10, 2023 •
edited

CLA: trivial

This PR is a result of discussion on resolving gf_mul symbol conflict when using intel/ISA-L and Openssl, #21302.

@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Jul 10, 2023
@Pankul94
Copy link
Contributor Author

Since these changes are just renaming internal functions, can we consider this trivial and not need the CLA check.

@Pankul94 Pankul94 mentioned this pull request Jul 10, 2023
Open
@t8m
Copy link
Member

t8m commented Jul 11, 2023

Since these changes are just renaming internal functions, can we consider this trivial and not need the CLA check.

Please see https://www.openssl.org/policies/cla.html how to mark the commit with CLA: trivial - it needs to be written in the commit message body on a separate line.

@t8m t8m 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 triaged: refactor The issue/pr requests/implements refactoring tests: exempted The PR is exempt from requirements for testing labels Jul 11, 2023
t8m
t8m reviewed Jul 11, 2023
View reviewed changes
crypto/ec/curve448/arch_32/f_impl32.c Outdated
@@ -100,6 +100,6 @@ void gf_mulw_unsigned(gf_s * RESTRICT cs, const gf as, uint32_t b)

void gf_sqr(gf_s * RESTRICT cs, const gf as)
Copy link
Member

Choose a reason for hiding this comment

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

Could you please rename also this one?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will follow the same standard, ossl_gf_sqr

@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Jul 11, 2023
@Pankul94 Pankul94 closed this Jul 11, 2023
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Jul 11, 2023
@Pankul94 Pankul94 reopened this Jul 11, 2023
@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Jul 11, 2023
@t8m
Copy link
Member

t8m commented Jul 11, 2023

Please add the CLA: trivial annotation to the commit message if you want to submit it without CLA.

As this is pure rename of 3 symbols I think it is acceptable as CLA: trivial.

@Pankul94 Pankul94 closed this Jul 11, 2023
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label Jul 11, 2023
@Pankul94
Changes to resolve symbol conflict due to gf_mul
599f993 
CLA: trivial

Changed names of internal functions to resolve symbol conflict when Openssl is used with intel/ISA-L.
@Pankul94 Pankul94 reopened this Jul 11, 2023
@Pankul94
Copy link
Contributor Author

Added CLA: Trivial to the git commit message

t8m
t8m approved these changes Jul 11, 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.

OK with CLA: trivial

@t8m t8m added the cla: trivial One of the commits is marked as 'CLA: trivial' label Jul 11, 2023
@kroeckx kroeckx 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 approval: otc review pending This pull request needs review by an OTC member labels Jul 12, 2023
@t8m
Copy link
Member

t8m commented Jul 12, 2023

@kroeckx please confirm you're OK with CLA: trivial for this.

@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

Merged. Thanks for the contribution.

@paulidale paulidale closed this Jul 13, 2023
openssl-machine pushed a commit that referenced this pull request Jul 13, 2023
@Pankul94 @paulidale
Changes to resolve symbol conflict due to gf_mul
15e041b 
CLA: trivial

Changed names of internal functions to resolve symbol conflict when Openssl is used with intel/ISA-L.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from #21421)
@baibaichen
Copy link

Would we cherry pick it to 3.0 and 3.1 branch?

@t8m
Copy link
Member

t8m commented Oct 16, 2023

Please submit a PR against 3.1 branch.

@joe-amzn joe-amzn mentioned this pull request Apr 9, 2024
Closed
2 tasks
joe-amzn pushed a commit to joe-amzn/openssl that referenced this pull request Apr 9, 2024
@Pankul94 @joe-amzn
Changes to resolve symbol conflict due to gf_mul
9aaf23b 
CLA: trivial

Changed names of internal functions to resolve symbol conflict when Openssl is used with intel/ISA-L.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from openssl#21421)
joe-amzn pushed a commit to joe-amzn/openssl that referenced this pull request Apr 9, 2024
@Pankul94 @joe-amzn
Changes to resolve symbol conflict due to gf_mul
eb8d18a 
CLA: trivial

Changed names of internal functions to resolve symbol conflict when Openssl is used with intel/ISA-L.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from openssl#21421)
@joe-amzn joe-amzn mentioned this pull request Apr 9, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kroeckx kroeckx kroeckx approved these changes

@t8m t8m t8m approved these changes

@paulidale paulidale paulidale approved these changes

Assignees
No one assigned
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch cla: trivial One of the commits is marked as 'CLA: trivial' 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
6 participants
@Pankul94 @t8m @openssl-machine @paulidale @baibaichen @kroeckx