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 /include | |
| 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 'include')
| -rw-r--r-- | include/openssl/serializererr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/serializererr.h b/include/openssl/serializererr.h index 4eff9deab6..f99143b4d1 100644 --- a/include/openssl/serializererr.h +++ b/include/openssl/serializererr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -10,6 +10,7 @@ #ifndef OPENSSL_OSSL_SERIALIZERERR_H # define OPENSSL_OSSL_SERIALIZERERR_H +# pragma once # include <openssl/opensslconf.h> # include <openssl/symhacks.h> @@ -30,5 +31,6 @@ int ERR_load_OSSL_SERIALIZER_strings(void); * OSSL_SERIALIZER reason codes. */ # define OSSL_SERIALIZER_R_INCORRECT_PROPERTY_QUERY 100 +# define OSSL_SERIALIZER_R_SERIALIZER_NOT_FOUND 101 #endif |