[openssl/openssl] 1adc6d: x509: fix double locking problem

[Pauli]

  Branch: refs/heads/openssl-3.1
  Home:   https://github.com/openssl/openssl
  Commit: 1adc6dbdb8fd48bf1290e7e405af14dabffc04e8
      https://github.com/openssl/openssl/commit/1adc6dbdb8fd48bf1290e7e405af14dabffc04e8
  Author: Pauli <pauli at openssl.org>
  Date:   2022-12-08 (Thu, 08 Dec 2022)

  Changed paths:
    M crypto/x509/pcy_map.c

  Log Message:
  -----------
  x509: fix double locking problem

This reverts commit 9aa4be691f5c73eb3c68606d824c104550c053f7 and removed the
redundant flag setting.

Fixes #19643

Fixes LOW CVE-2022-3996

Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19652)

(cherry picked from commit 4d0340a6d2f327700a059f0b8f954d6160f8eef5)


  Commit: d2cdcb663e646b372564485214fae1a878e292f4
      https://github.com/openssl/openssl/commit/d2cdcb663e646b372564485214fae1a878e292f4
  Author: Pauli <pauli at openssl.org>
  Date:   2022-12-08 (Thu, 08 Dec 2022)

  Changed paths:
    A test/certs/pkitsta.pem
    M test/recipes/80-test_cms.t
    A test/smime-eml/SignedInvalidMappingFromanyPolicyTest7.eml

  Log Message:
  -----------
  test: add test case for deadlock reported in #19643

Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19652)

(cherry picked from commit 61203c2c59df5d0022e316a4fe614e5d18907715)


Compare: https://github.com/openssl/openssl/compare/31240c1a53af...d2cdcb663e64