aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2020-07-27 21:51:44 +0200
committerPauli <paul.dale@oracle.com>2020-08-01 11:51:20 +1000
commit3c033c5bfed214b02c0f041239d1cb8a4e27fd82 (patch)
tree44b1c0c4c3dee36c6077dcdd7f894881a193cb91 /util
parent319d0b2be96539f10628c98f37306655fd158f61 (diff)
downloadopenssl-3c033c5bfed214b02c0f041239d1cb8a4e27fd82.zip
openssl-3c033c5bfed214b02c0f041239d1cb8a4e27fd82.tar.gz
openssl-3c033c5bfed214b02c0f041239d1cb8a4e27fd82.tar.bz2
DESERIALIZER: Refactor the constructor setting API
It's not the best idea to set a whole bunch of parameters in one call, that leads to functions that are hard to update. Better to re-model this into several function made to set one parameter each. This also renames "finalizer" to "constructor", which was suggested earlier but got lost at the time. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12544)
Diffstat (limited to 'util')
-rw-r--r--util/libcrypto.num7
-rw-r--r--util/other.syms4
2 files changed, 8 insertions, 3 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num
index 0c94a3e..b1c7947 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5171,7 +5171,6 @@ OSSL_DESERIALIZER_from_fp ? 3_0_0 EXIST::FUNCTION:STDIO
OSSL_DESERIALIZER_CTX_add_deserializer ? 3_0_0 EXIST::FUNCTION:
OSSL_DESERIALIZER_CTX_add_extra ? 3_0_0 EXIST::FUNCTION:
OSSL_DESERIALIZER_CTX_num_deserializers ? 3_0_0 EXIST::FUNCTION:
-OSSL_DESERIALIZER_CTX_set_finalizer ? 3_0_0 EXIST::FUNCTION:
OSSL_DESERIALIZER_CTX_set_input_type ? 3_0_0 EXIST::FUNCTION:
OSSL_DESERIALIZER_export ? 3_0_0 EXIST::FUNCTION:
OSSL_DESERIALIZER_INSTANCE_deserializer ? 3_0_0 EXIST::FUNCTION:
@@ -5192,3 +5191,9 @@ EVP_PKEY_get1_ED25519 ? 3_0_0 EXIST::FUNCTION:EC
EVP_PKEY_set1_ED448 ? 3_0_0 EXIST::FUNCTION:EC
EVP_PKEY_get0_ED448 ? 3_0_0 EXIST::FUNCTION:EC
EVP_PKEY_get1_ED448 ? 3_0_0 EXIST::FUNCTION:EC
+OSSL_DESERIALIZER_CTX_set_construct ? 3_0_0 EXIST::FUNCTION:
+OSSL_DESERIALIZER_CTX_set_construct_data ? 3_0_0 EXIST::FUNCTION:
+OSSL_DESERIALIZER_CTX_set_cleanup ? 3_0_0 EXIST::FUNCTION:
+OSSL_DESERIALIZER_CTX_get_construct ? 3_0_0 EXIST::FUNCTION:
+OSSL_DESERIALIZER_CTX_get_construct_data ? 3_0_0 EXIST::FUNCTION:
+OSSL_DESERIALIZER_CTX_get_cleanup ? 3_0_0 EXIST::FUNCTION:
diff --git a/util/other.syms b/util/other.syms
index a8eda47..bfe3203 100644
--- a/util/other.syms
+++ b/util/other.syms
@@ -43,8 +43,8 @@ OPENSSL_CTX datatype
NAMING_AUTHORITY datatype
OSSL_DESERIALIZER datatype
OSSL_DESERIALIZER_CTX datatype
-OSSL_DESERIALIZER_FINALIZER datatype
-OSSL_DESERIALIZER_CLEANER datatype
+OSSL_DESERIALIZER_CONSTRUCT datatype
+OSSL_DESERIALIZER_CLEANUP datatype
OSSL_DESERIALIZER_INSTANCE datatype
OSSL_DESERIALIZER_CTX datatype
OSSL_HTTP_bio_cb_t datatype