Skip to content

Comments

Backport 27529 to 3.4#27558

Closed
DDvO wants to merge 4 commits intoopenssl:openssl-3.4from
siemens:backport-27529-to-3.4
Closed

Backport 27529 to 3.4#27558
DDvO wants to merge 4 commits intoopenssl:openssl-3.4from
siemens:backport-27529-to-3.4

Conversation

@DDvO
Copy link
Contributor

@DDvO DDvO commented May 5, 2025

This cherry-picks the commits of #27529 and the fixup commit in #27549 needed for backporting.
In addition just had to align the number of tests planned in test/recipes/25-test_verify.t.

levitte and others added 4 commits May 5, 2025 08:30
The cached X509_LOOKUP method data is no longer just the URI, but now
includes the OSSL_STORE_CTX pointer, and required parameters to reopen
the URI at any time.  cache_objects() is modified to handle this, and
only (re)open the URI when it wasn't previously opened, or when it was
closed by an earlier call.

This way, we can call OSSL_STORE_open_ex() in by_store_ctrl_ex(), and
get to see possible errors when the URI is loaded.

This assumes that if the URI could be opened once, it can be opened
again.

Fixes openssl#27461

Reviewed-by: David von Oheimb <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#27529)

(cherry picked from commit 0c48ee2)
Originally from openssl#27507, with some
changes.

Co-authored-by: Richard Levitte <[email protected]>

Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
(Merged from openssl#27529)

(cherry picked from commit 927deba)
It was used to pass libctx and propq, which would override the
corresponding values passed to by_store_ctrl_ex().  This wasn't
really reasonable to do either way, as it could potentially be a
surprise to the user, who can reasonably expect that the URI is
opened with the libctx and propq that was passed with the URI, and
not with those passed later.

Reviewed-by: David von Oheimb <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#27529)

(cherry picked from commit af5952d)
This removes a couple of tests that check a relaxation of the
'file:' scheme implementation that isn't present before OpenSSL 3.6

Reviewed-by: David von Oheimb <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from openssl#27549)
@DDvO DDvO added approval: review pending This pull request needs review by a committer triaged: bug The issue/pr is/fixes a bug tests: present The PR has suitable tests present branch: 3.4 Applies to openssl-3.4 style: waived exempted from style checks labels May 5, 2025
@levitte
Copy link
Member

levitte commented May 5, 2025

Er, ok. I did the same work already, in #27550?

@DDvO
Copy link
Contributor Author

DDvO commented May 5, 2025

Oh, so closing this one.

@DDvO DDvO closed this May 5, 2025
@DDvO DDvO removed the approval: review pending This pull request needs review by a committer label Aug 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch: 3.4 Applies to openssl-3.4 style: waived exempted from style checks tests: present The PR has suitable tests present triaged: bug The issue/pr is/fixes a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants