Skip to content

Comments

Remove ENGINE usage from crypto subdirs#28629

Closed
jogme wants to merge 3 commits intoopenssl:feature/engineremovalfrom
jogme:1625
Closed

Remove ENGINE usage from crypto subdirs#28629
jogme wants to merge 3 commits intoopenssl:feature/engineremovalfrom
jogme:1625

Conversation

@jogme
Copy link
Contributor

@jogme jogme commented Sep 22, 2025

The functiontality here was already removed by the OPENSSL_NO_ENGINE guard.
This PR makes the internal function shiny.

Resolves: openssl/project#1625

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

@jogme jogme linked an issue Sep 22, 2025 that may be closed by this pull request
@jogme jogme changed the title Remove ENGINE usage from crypto/dh/* Remove ENGINE usage from crypto subdirs Sep 22, 2025
@jogme jogme marked this pull request as draft September 22, 2025 07:14
@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Sep 22, 2025
@jogme jogme force-pushed the 1625 branch 2 times, most recently from 9237be8 to bcbdda0 Compare November 11, 2025 13:34
@jogme jogme force-pushed the 1625 branch 2 times, most recently from ded7b50 to a21b9c8 Compare November 11, 2025 13:49
@jogme jogme force-pushed the 1625 branch 2 times, most recently from e229d4a to 7c70e29 Compare November 11, 2025 15:56
@jogme jogme requested a review from mbroz November 11, 2025 16:47
@jogme jogme marked this pull request as ready for review November 12, 2025 09:26
Copy link
Member

@mbroz mbroz left a comment

Choose a reason for hiding this comment

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

I think the ossl_unused attribute is not correct for most API calls, but please correct me if it has different meaning than attribute((unused)) (defined in e_os2.h) ...

@jogme jogme force-pushed the 1625 branch 2 times, most recently from 6883e71 to 84c23a3 Compare November 13, 2025 14:11
Copy link
Member

@mbroz mbroz left a comment

Choose a reason for hiding this comment

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

LGTM

Deprecated OSSL_STORE_LOADER_get0_engine could be also replaced by a stub, but I think it is better to keep it returning NULL.

@jogme jogme force-pushed the 1625 branch 2 times, most recently from 6b8cb63 to c6388b7 Compare November 13, 2025 15:55
Copy link
Member

@esyr esyr left a comment

Choose a reason for hiding this comment

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

It's unfortunate that changes in internal functions are intermixed with NULL checks for the engine parameters in publicly facing functions, as well as ossl_unused additions/removals in the same commit, but I guess that's immaterial. The only meaningful change required is the leak fix, everything else is good enough as it is.

@jogme jogme force-pushed the 1625 branch 2 times, most recently from c7d9244 to eda0770 Compare November 19, 2025 08:40
@jogme jogme requested a review from esyr November 19, 2025 08:41
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. thanks.

@Sashan Sashan added approval: review pending This pull request needs review by a committer branch: feature The issue or PR is relevant only to one of the feature branches. labels Dec 1, 2025
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.

One nit

@jogme jogme requested a review from t8m December 2, 2025 11:03
Copy link
Member

@esyr esyr left a comment

Choose a reason for hiding this comment

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

Still LGTM.

@t8m t8m added approval: done This pull request has the required number of approvals triaged: feature The issue/pr requests/adds a feature tests: exempted The PR is exempt from requirements for testing and removed approval: review pending This pull request needs review by a committer labels Dec 2, 2025
jogme added 3 commits December 3, 2025 15:48
Engines can be removed safely from static and internal functions
clearing out our codebase.

Resolves: openssl/project#1625

Signed-off-by: Norbert Pocs <[email protected]>
@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 Dec 3, 2025
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Dec 3, 2025
Engines can be removed safely from static and internal functions
clearing out our codebase.

Resolves: openssl/project#1625

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Eugene Syromiatnikov <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from #28629)
@Sashan
Copy link
Contributor

Sashan commented Dec 3, 2025

CI is not relevant. changes were merged to feature branch via
c953e3d

@Sashan Sashan closed this Dec 3, 2025
mbroz pushed a commit to mbroz/openssl that referenced this pull request Dec 4, 2025
Engines can be removed safely from static and internal functions
clearing out our codebase.

Resolves: openssl/project#1625

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Eugene Syromiatnikov <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#28629)
nhorman pushed a commit to nhorman/openssl that referenced this pull request Dec 4, 2025
Engines can be removed safely from static and internal functions
clearing out our codebase.

Resolves: openssl/project#1625

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Eugene Syromiatnikov <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#28629)
mbroz pushed a commit to mbroz/openssl that referenced this pull request Dec 4, 2025
Engines can be removed safely from static and internal functions
clearing out our codebase.

Resolves: openssl/project#1625

Signed-off-by: Norbert Pocs <[email protected]>

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Eugene Syromiatnikov <[email protected]>
Reviewed-by: Saša Nedvědický <[email protected]>
(Merged from openssl#28629)
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: feature The issue or PR is relevant only to one of the feature branches. severity: fips change The pull request changes FIPS provider sources tests: exempted The PR is exempt from requirements for testing triaged: feature The issue/pr requests/adds a feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Remove engines from crypto subdirectories

8 participants