@@ -83,24 +83,24 @@ struct evp_rand_st {
8383 CRYPTO_RWLOCK * refcnt_lock ;
8484
8585 const OSSL_DISPATCH * dispatch ;
86- OSSL_OP_rand_newctx_fn * newctx ;
87- OSSL_OP_rand_freectx_fn * freectx ;
88- OSSL_OP_rand_instantiate_fn * instantiate ;
89- OSSL_OP_rand_uninstantiate_fn * uninstantiate ;
90- OSSL_OP_rand_generate_fn * generate ;
91- OSSL_OP_rand_reseed_fn * reseed ;
92- OSSL_OP_rand_nonce_fn * nonce ;
93- OSSL_OP_rand_enable_locking_fn * enable_locking ;
94- OSSL_OP_rand_lock_fn * lock ;
95- OSSL_OP_rand_unlock_fn * unlock ;
96- OSSL_OP_rand_gettable_params_fn * gettable_params ;
97- OSSL_OP_rand_gettable_ctx_params_fn * gettable_ctx_params ;
98- OSSL_OP_rand_settable_ctx_params_fn * settable_ctx_params ;
99- OSSL_OP_rand_get_params_fn * get_params ;
100- OSSL_OP_rand_get_ctx_params_fn * get_ctx_params ;
101- OSSL_OP_rand_set_ctx_params_fn * set_ctx_params ;
102- OSSL_OP_rand_set_callbacks_fn * set_callbacks ;
103- OSSL_OP_rand_verify_zeroization_fn * verify_zeroization ;
86+ OSSL_FUNC_rand_newctx_fn * newctx ;
87+ OSSL_FUNC_rand_freectx_fn * freectx ;
88+ OSSL_FUNC_rand_instantiate_fn * instantiate ;
89+ OSSL_FUNC_rand_uninstantiate_fn * uninstantiate ;
90+ OSSL_FUNC_rand_generate_fn * generate ;
91+ OSSL_FUNC_rand_reseed_fn * reseed ;
92+ OSSL_FUNC_rand_nonce_fn * nonce ;
93+ OSSL_FUNC_rand_enable_locking_fn * enable_locking ;
94+ OSSL_FUNC_rand_lock_fn * lock ;
95+ OSSL_FUNC_rand_unlock_fn * unlock ;
96+ OSSL_FUNC_rand_gettable_params_fn * gettable_params ;
97+ OSSL_FUNC_rand_gettable_ctx_params_fn * gettable_ctx_params ;
98+ OSSL_FUNC_rand_settable_ctx_params_fn * settable_ctx_params ;
99+ OSSL_FUNC_rand_get_params_fn * get_params ;
100+ OSSL_FUNC_rand_get_ctx_params_fn * get_ctx_params ;
101+ OSSL_FUNC_rand_set_ctx_params_fn * set_ctx_params ;
102+ OSSL_FUNC_rand_set_callbacks_fn * set_callbacks ;
103+ OSSL_FUNC_rand_verify_zeroization_fn * verify_zeroization ;
104104} /* EVP_RAND */ ;
105105
106106struct evp_keymgmt_st {
@@ -112,33 +112,33 @@ struct evp_keymgmt_st {
112112 CRYPTO_RWLOCK * lock ;
113113
114114 /* Constructor(s), destructor, information */
115- OSSL_OP_keymgmt_new_fn * new ;
116- OSSL_OP_keymgmt_free_fn * free ;
117- OSSL_OP_keymgmt_get_params_fn * get_params ;
118- OSSL_OP_keymgmt_gettable_params_fn * gettable_params ;
119- OSSL_OP_keymgmt_set_params_fn * set_params ;
120- OSSL_OP_keymgmt_settable_params_fn * settable_params ;
115+ OSSL_FUNC_keymgmt_new_fn * new ;
116+ OSSL_FUNC_keymgmt_free_fn * free ;
117+ OSSL_FUNC_keymgmt_get_params_fn * get_params ;
118+ OSSL_FUNC_keymgmt_gettable_params_fn * gettable_params ;
119+ OSSL_FUNC_keymgmt_set_params_fn * set_params ;
120+ OSSL_FUNC_keymgmt_settable_params_fn * settable_params ;
121121
122122 /* Generation, a complex constructor */
123- OSSL_OP_keymgmt_gen_init_fn * gen_init ;
124- OSSL_OP_keymgmt_gen_set_template_fn * gen_set_template ;
125- OSSL_OP_keymgmt_gen_set_params_fn * gen_set_params ;
126- OSSL_OP_keymgmt_gen_settable_params_fn * gen_settable_params ;
127- OSSL_OP_keymgmt_gen_fn * gen ;
128- OSSL_OP_keymgmt_gen_cleanup_fn * gen_cleanup ;
123+ OSSL_FUNC_keymgmt_gen_init_fn * gen_init ;
124+ OSSL_FUNC_keymgmt_gen_set_template_fn * gen_set_template ;
125+ OSSL_FUNC_keymgmt_gen_set_params_fn * gen_set_params ;
126+ OSSL_FUNC_keymgmt_gen_settable_params_fn * gen_settable_params ;
127+ OSSL_FUNC_keymgmt_gen_fn * gen ;
128+ OSSL_FUNC_keymgmt_gen_cleanup_fn * gen_cleanup ;
129129
130130 /* Key object checking */
131- OSSL_OP_keymgmt_query_operation_name_fn * query_operation_name ;
132- OSSL_OP_keymgmt_has_fn * has ;
133- OSSL_OP_keymgmt_validate_fn * validate ;
134- OSSL_OP_keymgmt_match_fn * match ;
131+ OSSL_FUNC_keymgmt_query_operation_name_fn * query_operation_name ;
132+ OSSL_FUNC_keymgmt_has_fn * has ;
133+ OSSL_FUNC_keymgmt_validate_fn * validate ;
134+ OSSL_FUNC_keymgmt_match_fn * match ;
135135
136136 /* Import and export routines */
137- OSSL_OP_keymgmt_import_fn * import ;
138- OSSL_OP_keymgmt_import_types_fn * import_types ;
139- OSSL_OP_keymgmt_export_fn * export ;
140- OSSL_OP_keymgmt_export_types_fn * export_types ;
141- OSSL_OP_keymgmt_copy_fn * copy ;
137+ OSSL_FUNC_keymgmt_import_fn * import ;
138+ OSSL_FUNC_keymgmt_import_types_fn * import_types ;
139+ OSSL_FUNC_keymgmt_export_fn * export ;
140+ OSSL_FUNC_keymgmt_export_types_fn * export_types ;
141+ OSSL_FUNC_keymgmt_copy_fn * copy ;
142142} /* EVP_KEYMGMT */ ;
143143
144144struct evp_keyexch_st {
@@ -147,16 +147,16 @@ struct evp_keyexch_st {
147147 CRYPTO_REF_COUNT refcnt ;
148148 CRYPTO_RWLOCK * lock ;
149149
150- OSSL_OP_keyexch_newctx_fn * newctx ;
151- OSSL_OP_keyexch_init_fn * init ;
152- OSSL_OP_keyexch_set_peer_fn * set_peer ;
153- OSSL_OP_keyexch_derive_fn * derive ;
154- OSSL_OP_keyexch_freectx_fn * freectx ;
155- OSSL_OP_keyexch_dupctx_fn * dupctx ;
156- OSSL_OP_keyexch_set_ctx_params_fn * set_ctx_params ;
157- OSSL_OP_keyexch_settable_ctx_params_fn * settable_ctx_params ;
158- OSSL_OP_keyexch_get_ctx_params_fn * get_ctx_params ;
159- OSSL_OP_keyexch_gettable_ctx_params_fn * gettable_ctx_params ;
150+ OSSL_FUNC_keyexch_newctx_fn * newctx ;
151+ OSSL_FUNC_keyexch_init_fn * init ;
152+ OSSL_FUNC_keyexch_set_peer_fn * set_peer ;
153+ OSSL_FUNC_keyexch_derive_fn * derive ;
154+ OSSL_FUNC_keyexch_freectx_fn * freectx ;
155+ OSSL_FUNC_keyexch_dupctx_fn * dupctx ;
156+ OSSL_FUNC_keyexch_set_ctx_params_fn * set_ctx_params ;
157+ OSSL_FUNC_keyexch_settable_ctx_params_fn * settable_ctx_params ;
158+ OSSL_FUNC_keyexch_get_ctx_params_fn * get_ctx_params ;
159+ OSSL_FUNC_keyexch_gettable_ctx_params_fn * gettable_ctx_params ;
160160} /* EVP_KEYEXCH */ ;
161161
162162struct evp_signature_st {
@@ -165,31 +165,31 @@ struct evp_signature_st {
165165 CRYPTO_REF_COUNT refcnt ;
166166 CRYPTO_RWLOCK * lock ;
167167
168- OSSL_OP_signature_newctx_fn * newctx ;
169- OSSL_OP_signature_sign_init_fn * sign_init ;
170- OSSL_OP_signature_sign_fn * sign ;
171- OSSL_OP_signature_verify_init_fn * verify_init ;
172- OSSL_OP_signature_verify_fn * verify ;
173- OSSL_OP_signature_verify_recover_init_fn * verify_recover_init ;
174- OSSL_OP_signature_verify_recover_fn * verify_recover ;
175- OSSL_OP_signature_digest_sign_init_fn * digest_sign_init ;
176- OSSL_OP_signature_digest_sign_update_fn * digest_sign_update ;
177- OSSL_OP_signature_digest_sign_final_fn * digest_sign_final ;
178- OSSL_OP_signature_digest_sign_fn * digest_sign ;
179- OSSL_OP_signature_digest_verify_init_fn * digest_verify_init ;
180- OSSL_OP_signature_digest_verify_update_fn * digest_verify_update ;
181- OSSL_OP_signature_digest_verify_final_fn * digest_verify_final ;
182- OSSL_OP_signature_digest_verify_fn * digest_verify ;
183- OSSL_OP_signature_freectx_fn * freectx ;
184- OSSL_OP_signature_dupctx_fn * dupctx ;
185- OSSL_OP_signature_get_ctx_params_fn * get_ctx_params ;
186- OSSL_OP_signature_gettable_ctx_params_fn * gettable_ctx_params ;
187- OSSL_OP_signature_set_ctx_params_fn * set_ctx_params ;
188- OSSL_OP_signature_settable_ctx_params_fn * settable_ctx_params ;
189- OSSL_OP_signature_get_ctx_md_params_fn * get_ctx_md_params ;
190- OSSL_OP_signature_gettable_ctx_md_params_fn * gettable_ctx_md_params ;
191- OSSL_OP_signature_set_ctx_md_params_fn * set_ctx_md_params ;
192- OSSL_OP_signature_settable_ctx_md_params_fn * settable_ctx_md_params ;
168+ OSSL_FUNC_signature_newctx_fn * newctx ;
169+ OSSL_FUNC_signature_sign_init_fn * sign_init ;
170+ OSSL_FUNC_signature_sign_fn * sign ;
171+ OSSL_FUNC_signature_verify_init_fn * verify_init ;
172+ OSSL_FUNC_signature_verify_fn * verify ;
173+ OSSL_FUNC_signature_verify_recover_init_fn * verify_recover_init ;
174+ OSSL_FUNC_signature_verify_recover_fn * verify_recover ;
175+ OSSL_FUNC_signature_digest_sign_init_fn * digest_sign_init ;
176+ OSSL_FUNC_signature_digest_sign_update_fn * digest_sign_update ;
177+ OSSL_FUNC_signature_digest_sign_final_fn * digest_sign_final ;
178+ OSSL_FUNC_signature_digest_sign_fn * digest_sign ;
179+ OSSL_FUNC_signature_digest_verify_init_fn * digest_verify_init ;
180+ OSSL_FUNC_signature_digest_verify_update_fn * digest_verify_update ;
181+ OSSL_FUNC_signature_digest_verify_final_fn * digest_verify_final ;
182+ OSSL_FUNC_signature_digest_verify_fn * digest_verify ;
183+ OSSL_FUNC_signature_freectx_fn * freectx ;
184+ OSSL_FUNC_signature_dupctx_fn * dupctx ;
185+ OSSL_FUNC_signature_get_ctx_params_fn * get_ctx_params ;
186+ OSSL_FUNC_signature_gettable_ctx_params_fn * gettable_ctx_params ;
187+ OSSL_FUNC_signature_set_ctx_params_fn * set_ctx_params ;
188+ OSSL_FUNC_signature_settable_ctx_params_fn * settable_ctx_params ;
189+ OSSL_FUNC_signature_get_ctx_md_params_fn * get_ctx_md_params ;
190+ OSSL_FUNC_signature_gettable_ctx_md_params_fn * gettable_ctx_md_params ;
191+ OSSL_FUNC_signature_set_ctx_md_params_fn * set_ctx_md_params ;
192+ OSSL_FUNC_signature_settable_ctx_md_params_fn * settable_ctx_md_params ;
193193} /* EVP_SIGNATURE */ ;
194194
195195struct evp_asym_cipher_st {
@@ -198,17 +198,17 @@ struct evp_asym_cipher_st {
198198 CRYPTO_REF_COUNT refcnt ;
199199 CRYPTO_RWLOCK * lock ;
200200
201- OSSL_OP_asym_cipher_newctx_fn * newctx ;
202- OSSL_OP_asym_cipher_encrypt_init_fn * encrypt_init ;
203- OSSL_OP_asym_cipher_encrypt_fn * encrypt ;
204- OSSL_OP_asym_cipher_decrypt_init_fn * decrypt_init ;
205- OSSL_OP_asym_cipher_decrypt_fn * decrypt ;
206- OSSL_OP_asym_cipher_freectx_fn * freectx ;
207- OSSL_OP_asym_cipher_dupctx_fn * dupctx ;
208- OSSL_OP_asym_cipher_get_ctx_params_fn * get_ctx_params ;
209- OSSL_OP_asym_cipher_gettable_ctx_params_fn * gettable_ctx_params ;
210- OSSL_OP_asym_cipher_set_ctx_params_fn * set_ctx_params ;
211- OSSL_OP_asym_cipher_settable_ctx_params_fn * settable_ctx_params ;
201+ OSSL_FUNC_asym_cipher_newctx_fn * newctx ;
202+ OSSL_FUNC_asym_cipher_encrypt_init_fn * encrypt_init ;
203+ OSSL_FUNC_asym_cipher_encrypt_fn * encrypt ;
204+ OSSL_FUNC_asym_cipher_decrypt_init_fn * decrypt_init ;
205+ OSSL_FUNC_asym_cipher_decrypt_fn * decrypt ;
206+ OSSL_FUNC_asym_cipher_freectx_fn * freectx ;
207+ OSSL_FUNC_asym_cipher_dupctx_fn * dupctx ;
208+ OSSL_FUNC_asym_cipher_get_ctx_params_fn * get_ctx_params ;
209+ OSSL_FUNC_asym_cipher_gettable_ctx_params_fn * gettable_ctx_params ;
210+ OSSL_FUNC_asym_cipher_set_ctx_params_fn * set_ctx_params ;
211+ OSSL_FUNC_asym_cipher_settable_ctx_params_fn * settable_ctx_params ;
212212} /* EVP_ASYM_CIPHER */ ;
213213
214214int PKCS5_v2_PBKDF2_keyivgen (EVP_CIPHER_CTX * ctx , const char * pass ,
0 commit comments