diff options
| author | Pauli <paul.dale@oracle.com> | 2020-06-17 12:16:10 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-06-23 19:46:57 +1000 |
| commit | 90cf3099df43a5419d59e6a66e75970cbb50a28a (patch) | |
| tree | b26177d2943a605ad90c8299ce4491273665ddc8 /crypto/err | |
| parent | 22063850586945fd98ad3656df21c16adfef89ae (diff) | |
serialization: break the provider locating code to avoid deadlock.
Find all the suitable implementation names and later decide which is best.
This avoids a lock order inversion.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12173)
Diffstat (limited to 'crypto/err')
| -rw-r--r-- | crypto/err/openssl.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 1585688c83..c308036003 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2682,6 +2682,7 @@ OCSP_R_UNKNOWN_MESSAGE_DIGEST:119:unknown message digest OCSP_R_UNKNOWN_NID:120:unknown nid OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE:129:unsupported requestorname type OSSL_SERIALIZER_R_INCORRECT_PROPERTY_QUERY:100:incorrect property query +OSSL_SERIALIZER_R_SERIALIZER_NOT_FOUND:101:serializer not found OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE:107:ambiguous content type OSSL_STORE_R_BAD_PASSWORD_READ:115:bad password read OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC:113:error verifying pkcs12 mac |