[openssl/openssl] 248206: Check error return from cms_sd_asn1_ctrl() correctly.

Richard Levitte noreply at github.com
Fri Sep 8 06:39:50 UTC 2023


  Branch: refs/heads/openssl-3.0
  Home:   https://github.com/openssl/openssl
  Commit: 2482061d7ec07aeda149c69f4b0190b8826bb5bf
      https://github.com/openssl/openssl/commit/2482061d7ec07aeda149c69f4b0190b8826bb5bf
  Author: Pauli <pauli at openssl.org>
  Date:   2023-09-08 (Fri, 08 Sep 2023)

  Changed paths:
    M crypto/cms/cms_sd.c

  Log Message:
  -----------
  Check error return from cms_sd_asn1_ctrl() correctly.

Fixes #21986

Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/21988)

(cherry picked from commit 00a413e2483257a17239cef5dde52df14926284c)


  Commit: 41136a998e833a2992b2026dc8b2e83ca7ceb0bd
      https://github.com/openssl/openssl/commit/41136a998e833a2992b2026dc8b2e83ca7ceb0bd
  Author: Pauli <pauli at openssl.org>
  Date:   2023-09-08 (Fri, 08 Sep 2023)

  Changed paths:
    M test/recipes/80-test_cms.t

  Log Message:
  -----------
  Add test case for #21986

Reviewed-by: Tomas Mraz <tomas at openssl.org>
Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
(Merged from https://github.com/openssl/openssl/pull/21988)

(cherry picked from commit c870a465864259f0bdec0953ad085da31941bc27)


  Commit: 137e3a9ac07706a8ec65f2afd31236d9180ad4f0
      https://github.com/openssl/openssl/commit/137e3a9ac07706a8ec65f2afd31236d9180ad4f0
  Author: Richard Levitte <levitte at openssl.org>
  Date:   2023-09-08 (Fri, 08 Sep 2023)

  Changed paths:
    M crypto/store/store_lib.c

  Log Message:
  -----------
  OSSL_STORE: Fix error flag clearing and setting (provider path only)

When the provider's load function returned with an error, the libcrypto
error flag was only set if EOF hadn't been reached.  This is troublesome,
as an error can very well occur during the last load before EOF is reached!

Also, the error flag was never reset, even though documentation specifies
that it should indicate an error in the last load (i.e. not the one before
that).

Fixes #21968

Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
Reviewed-by: Paul Dale <pauli at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21976)

(cherry picked from commit 17dd9a2c6262c00800301fddd9441a9c590a630e)


Compare: https://github.com/openssl/openssl/compare/457fd058da31...137e3a9ac077


More information about the openssl-commits mailing list