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

Xpout and Xqout checked in wrong fashion #23253

Closed
wants to merge 2 commits into from
Closed

Xpout and Xqout checked in wrong fashion #23253

wants to merge 2 commits into from

Conversation

sharad3001
Copy link
Contributor

In the starting of the module ossl_rsa_fips186_4_gen_prob_primes, local variables are assigned as NULL i.e.

BIGNUM *Xpout = NULL, *Xqout = NULL;

while assigning to Xpo and Xqo they have been checked if they are NULL or not which is of no USE as they are already assigned with NULL.

Removed that check.

CLA: trivial

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

@sharad3001
Xpout and Xqout checked in wrong fashion
9438dee 
In the starting of the module ossl_rsa_fips186_4_gen_prob_primes, local variables are assigned as NULL i.e.

BIGNUM *Xpout = NULL, *Xqout = NULL;

while assigning to Xpo and Xqo they have been checked if they are NULL or not which is of no USE as they are already assigned with NULL.

Removed that check.

CLA: trivial
@kroeckx
Copy link
Member

kroeckx commented Jan 10, 2024

It looks like Xpout and Xqout are unused and can be removed completely. They're somehow documented as being returned.

@slontis: Is this some leftover?

@t8m t8m added branch: master Merge to master branch triaged: cleanup The issue/pr deals with cleanup of comments/docs not altering code significantly cla: trivial One of the commits is marked as 'CLA: trivial' 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 Jan 10, 2024
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Jan 10, 2024
@slontis
Copy link
Member

slontis commented Jan 10, 2024

It looks like the intention of these was only for ACVP TESTING, if we needed to get access to Xpo and Xqo whilst testing.
As it has been a few years since they were added we can assume that they dont need to be returned, so removing them altogether seems to be reasonable.

@t8m t8m 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 Jan 11, 2024
@t8m
Copy link
Member

t8m commented Jan 11, 2024

@sharad3001 Can you please change this to remove these variables?

@sharad3001
Removed Xpout and Xqout as suggested
b1b8a07 
As suggested removed the instances of Xpout and Xqout instances from code and comments
tom-cosgrove-arm
tom-cosgrove-arm approved these changes Jan 11, 2024
View reviewed changes
Copy link
Contributor

@tom-cosgrove-arm tom-cosgrove-arm left a comment

Choose a reason for hiding this comment

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

LGTM

@sharad3001
Copy link
Contributor Author

@t8m I have done the required changes, please check

@tom-cosgrove-arm tom-cosgrove-arm added 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 Jan 11, 2024
@tom-cosgrove-arm
Copy link
Contributor

Not sure why the approval labels were removed prior to approvals - I've put them back (and will now remove one again)

@tom-cosgrove-arm tom-cosgrove-arm removed the approval: review pending This pull request needs review by a committer label Jan 11, 2024
@tom-cosgrove-arm
Copy link
Contributor

I am okay with trivial on this (not really any other way to remove the two variables, and that change was suggested by a team member), but do we not need CLA: trivial on both commits?

@t8m
Copy link
Member

t8m commented Jan 11, 2024

I am okay with trivial on this (not really any other way to remove the two variables, and that change was suggested by a team member), but do we not need CLA: trivial on both commits?

The checking script apparently does not detect that - it would be detected when merging. But we should squash the commits on merge anyway.

t8m
t8m approved these changes Jan 11, 2024
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 as this is just removing things.

@t8m t8m added approval: done This pull request has the required number of approvals and removed approval: otc review pending This pull request needs review by an OTC member labels Jan 11, 2024
@openssl-machine openssl-machine 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 Jan 12, 2024
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@t8m
Copy link
Member

t8m commented Jan 12, 2024

Merged to the master branch after squashing and rewording the commit message. Thank you for your contribution.

@t8m t8m closed this Jan 12, 2024
openssl-machine pushed a commit that referenced this pull request Jan 12, 2024
@sharad3001 @t8m
ossl_rsa_fips186_4_gen_prob_primes(): Remove unused Xpout and Xqout
d8184e9 
CLA: trivial

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #23253)
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

@tom-cosgrove-arm tom-cosgrove-arm tom-cosgrove-arm approved these changes

Assignees
No one assigned
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge 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 triaged: cleanup The issue/pr deals with cleanup of comments/docs not altering code significantly
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@sharad3001 @kroeckx @slontis @t8m @tom-cosgrove-arm @openssl-machine