From 2e7cc141bbcbe6e9525a23f316955ff725a0c15c Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 25 Mar 2019 14:18:22 +0100 Subject: openpgp-ffi: Rename types. - Fixes e3cb52fede1872f93371677224201228a62ae6ce. --- openpgp-ffi/include/sequoia/openpgp.h | 14 +++++++------- openpgp-ffi/include/sequoia/openpgp/types.h | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'openpgp-ffi') diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h index c94fff17..8473e632 100644 --- a/openpgp-ffi/include/sequoia/openpgp.h +++ b/openpgp-ffi/include/sequoia/openpgp.h @@ -1437,9 +1437,9 @@ int pgp_verification_result_level(pgp_verification_result_t r); /// Note: all of the parameters are required; none may be NULL. /*/ pgp_reader_t pgp_decryptor_new (pgp_error_t *errp, pgp_reader_t input, - pgp_sequoia_decrypt_get_public_keys_cb_t get_public_keys, - pgp_sequoia_decrypt_get_secret_keys_cb_t get_secret_keys, - pgp_sequoia_decrypt_check_signatures_cb_t check_signatures, + pgp_decryptor_get_public_keys_cb_t get_public_keys, + pgp_decryptor_get_secret_keys_cb_t get_secret_keys, + pgp_decryptor_check_signatures_cb_t check_signatures, void *cookie); /*/ @@ -1449,8 +1449,8 @@ pgp_reader_t pgp_decryptor_new (pgp_error_t *errp, pgp_reader_t input, /// treated as opaque containers. /*/ pgp_reader_t pgp_verifier_new (pgp_error_t *errp, pgp_reader_t input, - pgp_sequoia_decrypt_get_public_keys_cb_t get_public_keys, - pgp_sequoia_decrypt_check_signatures_cb_t check_signatures, + pgp_decryptor_get_public_keys_cb_t get_public_keys, + pgp_decryptor_check_signatures_cb_t check_signatures, void *cookie); /*/ @@ -1458,8 +1458,8 @@ pgp_reader_t pgp_verifier_new (pgp_error_t *errp, pgp_reader_t input, /*/ pgp_reader_t pgp_detached_verifier_new (pgp_error_t *errp, pgp_reader_t signature_input, pgp_reader_t input, - pgp_sequoia_decrypt_get_public_keys_cb_t get_public_keys, - pgp_sequoia_decrypt_check_signatures_cb_t check_signatures, + pgp_decryptor_get_public_keys_cb_t get_public_keys, + pgp_decryptor_check_signatures_cb_t check_signatures, void *cookie); #endif diff --git a/openpgp-ffi/include/sequoia/openpgp/types.h b/openpgp-ffi/include/sequoia/openpgp/types.h index cf42c771..375832f9 100644 --- a/openpgp-ffi/include/sequoia/openpgp/types.h +++ b/openpgp-ffi/include/sequoia/openpgp/types.h @@ -456,18 +456,18 @@ typedef enum pgp_verification_result_code { PGP_VERIFICATION_RESULT_CODE_FORCE_WIDTH = INT_MAX, } pgp_verification_result_code_t; -typedef pgp_status_t (*pgp_sequoia_decrypt_get_public_keys_cb_t) (void *, - pgp_keyid_t *, size_t, - pgp_tpk_t **, size_t *, - void (**free)(void *)); - -typedef pgp_status_t (*pgp_sequoia_decrypt_get_secret_keys_cb_t) (void *, - pgp_pkesk_t *, size_t, - pgp_skesk_t *, size_t, - pgp_secret_t *); - -typedef pgp_status_t (*pgp_sequoia_decrypt_check_signatures_cb_t) (void *, - pgp_verification_results_t, - size_t); +typedef pgp_status_t (*pgp_decryptor_get_public_keys_cb_t) (void *, + pgp_keyid_t *, size_t, + pgp_tpk_t **, size_t *, + void (**free)(void *)); + +typedef pgp_status_t (*pgp_decryptor_get_secret_keys_cb_t) (void *, + pgp_pkesk_t *, size_t, + pgp_skesk_t *, size_t, + pgp_secret_t *); + +typedef pgp_status_t (*pgp_decryptor_check_signatures_cb_t) (void *, + pgp_verification_results_t, + size_t); #endif -- cgit v1.2.3