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.

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

Fix some combinations of no-* options #21722

Closed
wants to merge 4 commits into from

Conversation

mattcaswell
Copy link
Member

Fix no-dtls in combination with no-tls.
Fix no-dsa in combination with no-err.

@mattcaswell mattcaswell 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.0 Merge to openssl-3.0 branch branch: 3.1 Merge to openssl-3.1 tests: exempted The PR is exempt from requirements for testing labels Aug 11, 2023
@hlandau hlandau removed the approval: otc review pending This pull request needs review by an OTC member label Aug 11, 2023
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

@mattcaswell
Copy link
Member Author

@hlandau - please reconfirm

@tom-cosgrove-arm tom-cosgrove-arm 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 Aug 14, 2023
@mattcaswell mattcaswell added approval: review pending This pull request needs review by a committer and removed approval: done This pull request has the required number of approvals labels Aug 14, 2023
@hlandau hlandau 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 Aug 14, 2023
@t8m t8m added the triaged: bug The issue/pr is/fixes a bug label Aug 14, 2023
@slontis
Copy link
Member

slontis commented Aug 15, 2023

What is the context of these changes.. i.e. Is there existing tests that picked this issue up?

@mattcaswell
Copy link
Member Author

What is the context of these changes.. i.e. Is there existing tests that picked this issue up?

In this comment I talked about a set of options that could be used to try and minimise the size of the openssl executable in order to just be able to use fipsinstall:

#21703 (reply in thread)

But when I tried to use them I saw the compile errors I'm fixing here.

@mattcaswell
Copy link
Member Author

CI failure does not seem relevant.

@hlandau - CI failure was a multistream test script 12 failure....have we seen that one before?

@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.

@t8m t8m removed the approval: done This pull request has the required number of approvals label Aug 15, 2023
@t8m t8m added the approval: ready to merge The 24 hour grace period has passed, ready to merge label Aug 15, 2023
openssl-machine pushed a commit that referenced this pull request Aug 15, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #21722)
openssl-machine pushed a commit that referenced this pull request Aug 15, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #21722)
openssl-machine pushed a commit that referenced this pull request Aug 15, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #21722)

(cherry picked from commit fb32f6e)
openssl-machine pushed a commit that referenced this pull request Aug 15, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #21722)

(cherry picked from commit 4efd84f)
openssl-machine pushed a commit that referenced this pull request Aug 15, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #21722)

(cherry picked from commit fb32f6e)
openssl-machine pushed a commit that referenced this pull request Aug 15, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #21722)

(cherry picked from commit 4efd84f)
@t8m
Copy link
Member

t8m commented Aug 15, 2023

Merged to master, 3.1, and 3.0 branches. Thank you

@t8m t8m closed this Aug 15, 2023
xl32 pushed a commit to xl32/openssl that referenced this pull request Sep 29, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#21722)

(cherry picked from commit fb32f6e)
xl32 pushed a commit to xl32/openssl that referenced this pull request Sep 29, 2023
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from openssl#21722)

(cherry picked from commit 4efd84f)
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 branch: master Merge to master branch branch: 3.0 Merge to openssl-3.0 branch branch: 3.1 Merge to openssl-3.1 tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants