Make the naming scheme for dispatched functions more consistent

[oweals/openssl.git] / crypto / serializer / serializer_local.h

diff --git a/crypto/serializer/serializer_local.h b/crypto/serializer/serializer_local.h
index 9ee0eb82445e407781001960c739e346f693a69f..970c7c55852932e4090fd334d7dbffb4bb5a9c95 100644 (file)
--- a/crypto/serializer/serializer_local.h
+++ b/crypto/serializer/serializer_local.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019-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
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <openssl/core_numbers.h>
+#include <openssl/core_dispatch.h>
 #include <openssl/types.h>
 #include "internal/cryptlib.h"
 #include "internal/refcount.h"
@@ -20,18 +20,20 @@ struct ossl_serializer_st {
     CRYPTO_REF_COUNT refcnt;
     CRYPTO_RWLOCK *lock;
 
-    OSSL_OP_serializer_newctx_fn *newctx;
-    OSSL_OP_serializer_freectx_fn *freectx;
-    OSSL_OP_serializer_set_ctx_params_fn *set_ctx_params;
-    OSSL_OP_serializer_settable_ctx_params_fn *settable_ctx_params;
-    OSSL_OP_serializer_serialize_data_fn *serialize_data;
-    OSSL_OP_serializer_serialize_object_fn *serialize_object;
+    OSSL_FUNC_serializer_newctx_fn *newctx;
+    OSSL_FUNC_serializer_freectx_fn *freectx;
+    OSSL_FUNC_serializer_set_ctx_params_fn *set_ctx_params;
+    OSSL_FUNC_serializer_settable_ctx_params_fn *settable_ctx_params;
+    OSSL_FUNC_serializer_serialize_data_fn *serialize_data;
+    OSSL_FUNC_serializer_serialize_object_fn *serialize_object;
 };
 
 struct ossl_serializer_ctx_st {
     OSSL_SERIALIZER *ser;
     void *serctx;
 
+    int selection;
+
     /*
      * |object| is the libcrypto object to handle.
      * |do_output| must have intimate knowledge of this object.