]> git.ipfire.org Git - thirdparty/openssl.git/commit
Fix OSSL_STORE to consider cached info in the EOF check.
authorRichard Levitte <levitte@openssl.org>
Thu, 10 Jul 2025 15:55:50 +0000 (17:55 +0200)
committerDr. David von Oheimb <dev@ddvo.net>
Sat, 26 Jul 2025 09:35:10 +0000 (11:35 +0200)
commit3e5f4bbb03d07bd7bbc7a140ebed97f28c6501af
treed7fdf8a61b9e75e455d225eb0eb1a3bc772b1e37
parent7cac9230662e03e2c9450aa94d6df05bafa0909a
Fix OSSL_STORE to consider cached info in the EOF check.

OSSL_STORE_load() called OSSL_STORE_eof() before checking if there is
cached OSSL_STORE_INFO to consider.  To fix this issue, the cached info
check is moved to OSSL_STORE_eof(), as that seems to make most common
sense.

This solves an issue with PKCS#12 files, where the cached info was never
considered because the underlying file IO layer signaled that EOF is
reached.

Fixes #28010

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from https://github.com/openssl/openssl/pull/28016)

(cherry picked from commit 1f3af48c312a5f94612e9a822b78a3afdadc27c1)
crypto/store/store_lib.c