From bbbc6da375d6584c7b2bcc74e838fff943f489d4 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Thu, 28 Nov 2019 15:27:33 +0100 Subject: Call TPKs Certificates, update identifiers, documentation. - Fixes #387. --- openpgp-ffi/examples/decrypt-with.c | 30 +++++++++++++++--------------- openpgp-ffi/examples/encrypt-for.c | 16 ++++++++-------- openpgp-ffi/examples/example.c | 12 ++++++------ openpgp-ffi/examples/generate-key.c | 14 +++++++------- openpgp-ffi/examples/reader.c | 12 ++++++------ 5 files changed, 42 insertions(+), 42 deletions(-) (limited to 'openpgp-ffi/examples') diff --git a/openpgp-ffi/examples/decrypt-with.c b/openpgp-ffi/examples/decrypt-with.c index ada4dfd7..423106bd 100644 --- a/openpgp-ffi/examples/decrypt-with.c +++ b/openpgp-ffi/examples/decrypt-with.c @@ -21,19 +21,19 @@ #include struct decrypt_cookie { - pgp_tpk_t key; + pgp_cert_t key; int decrypt_called; }; static pgp_status_t get_public_keys_cb (void *cookie_raw, pgp_keyid_t *keyids, size_t keyids_len, - pgp_tpk_t **tpks, size_t *tpk_len, + pgp_cert_t **certs, size_t *cert_len, void (**our_free)(void *)) { - /* Feed the TPKs to the verifier here. */ - *tpks = NULL; - *tpk_len = 0; + /* Feed the Certs to the verifier here. */ + *certs = NULL; + *cert_len = 0; *our_free = free; return PGP_STATUS_SUCCESS; } @@ -155,9 +155,9 @@ decrypt_cb (void *cookie_opaque, pgp_pkesk_t pkesk = pkesks[i]; pgp_keyid_t keyid = pgp_pkesk_recipient (pkesk); - pgp_tpk_key_iter_t key_iter = pgp_tpk_key_iter_all (cookie->key); + pgp_cert_key_iter_t key_iter = pgp_cert_key_iter_all (cookie->key); pgp_key_t key; - while ((key = pgp_tpk_key_iter_next (key_iter, NULL, NULL))) { + while ((key = pgp_cert_key_iter_next (key_iter, NULL, NULL))) { pgp_keyid_t this_keyid = pgp_key_keyid (key); int match = pgp_keyid_equal (this_keyid, keyid); pgp_keyid_free (this_keyid); @@ -165,7 +165,7 @@ decrypt_cb (void *cookie_opaque, break; pgp_key_free (key); } - pgp_tpk_key_iter_free (key_iter); + pgp_cert_key_iter_free (key_iter); pgp_keyid_free (keyid); if (! key) continue; @@ -185,7 +185,7 @@ decrypt_cb (void *cookie_opaque, rc = decrypt (decrypt_cookie, algo, sk); pgp_session_key_free (sk); - *identity_out = pgp_tpk_fingerprint (cookie->key); + *identity_out = pgp_cert_fingerprint (cookie->key); return rc; } @@ -196,7 +196,7 @@ int main (int argc, char **argv) { pgp_error_t err; - pgp_tpk_t tpk; + pgp_cert_t cert; pgp_reader_t source; pgp_reader_t plaintext; uint8_t buf[1024]; @@ -205,15 +205,15 @@ main (int argc, char **argv) if (argc != 2) error (1, 0, "Usage: %s plain", argv[0]); - tpk = pgp_tpk_from_file (&err, argv[1]); - if (tpk == NULL) - error (1, 0, "pgp_tpk_from_file: %s", pgp_error_to_string (err)); + cert = pgp_cert_from_file (&err, argv[1]); + if (cert == NULL) + error (1, 0, "pgp_cert_from_file: %s", pgp_error_to_string (err)); source = pgp_reader_from_fd (STDIN_FILENO); assert (source); struct decrypt_cookie cookie = { - .key = tpk, + .key = cert, .decrypt_called = 0, }; plaintext = pgp_decryptor_new (&err, source, @@ -230,6 +230,6 @@ main (int argc, char **argv) pgp_reader_free (plaintext); pgp_reader_free (source); - pgp_tpk_free (tpk); + pgp_cert_free (cert); return 0; } diff --git a/openpgp-ffi/examples/encrypt-for.c b/openpgp-ffi/examples/encrypt-for.c index 49bf025e..abf9d1a9 100644 --- a/openpgp-ffi/examples/encrypt-for.c +++ b/openpgp-ffi/examples/encrypt-for.c @@ -25,20 +25,20 @@ main (int argc, char **argv) pgp_status_t rc; pgp_error_t err; int use_armor = 1; - pgp_tpk_t tpk; + pgp_cert_t cert; pgp_writer_t sink; pgp_writer_stack_t writer = NULL; if (argc != 2) error (1, 0, "Usage: %s cipher", argv[0]); - tpk = pgp_tpk_from_file (&err, argv[1]); - if (tpk == NULL) - error (1, 0, "pgp_tpk_from_file: %s", pgp_error_to_string (err)); + cert = pgp_cert_from_file (&err, argv[1]); + if (cert == NULL) + error (1, 0, "pgp_cert_from_file: %s", pgp_error_to_string (err)); - pgp_tpk_key_iter_t iter = pgp_tpk_key_iter_valid (tpk); - pgp_tpk_key_iter_encrypting_capable_at_rest (iter); - pgp_tpk_key_iter_encrypting_capable_for_transport (iter); + pgp_cert_key_iter_t iter = pgp_cert_key_iter_valid (cert); + pgp_cert_key_iter_encrypting_capable_at_rest (iter); + pgp_cert_key_iter_encrypting_capable_for_transport (iter); size_t recipients_len; pgp_recipient_t *recipients = pgp_recipients_from_key_iter (iter, &recipients_len); @@ -88,6 +88,6 @@ main (int argc, char **argv) for (size_t i = 0; i < recipients_len; i++) pgp_recipient_free (recipients[i]); free (recipients); - pgp_tpk_free (tpk); + pgp_cert_free (cert); return 0; } diff --git a/openpgp-ffi/examples/example.c b/openpgp-ffi/examples/example.c index 3c561761..9bc0da97 100644 --- a/openpgp-ffi/examples/example.c +++ b/openpgp-ffi/examples/example.c @@ -19,19 +19,19 @@ int main (int argc, char **argv) { pgp_error_t err; - pgp_tpk_t tpk; + pgp_cert_t cert; if (argc != 2) error (1, 0, "Usage: %s ", argv[0]); - tpk = pgp_tpk_from_file (&err, argv[1]); - if (tpk == NULL) - error (1, 0, "pgp_tpk_from_file: %s", pgp_error_to_string (err)); + cert = pgp_cert_from_file (&err, argv[1]); + if (cert == NULL) + error (1, 0, "pgp_cert_from_file: %s", pgp_error_to_string (err)); - char *debug = pgp_tpk_debug (tpk); + char *debug = pgp_cert_debug (cert); printf ("%s", debug); free (debug); - pgp_tpk_free (tpk); + pgp_cert_free (cert); return 0; } diff --git a/openpgp-ffi/examples/generate-key.c b/openpgp-ffi/examples/generate-key.c index fed2852c..b66c7a30 100644 --- a/openpgp-ffi/examples/generate-key.c +++ b/openpgp-ffi/examples/generate-key.c @@ -9,13 +9,13 @@ main () { pgp_status_t rc; /* First, generate the key. */ - pgp_tpk_builder_t builder = pgp_tpk_builder_new (); - pgp_tpk_builder_set_cipher_suite (&builder, PGP_TPK_CIPHER_SUITE_CV25519); + pgp_cert_builder_t builder = pgp_cert_builder_new (); + pgp_cert_builder_set_cipher_suite (&builder, PGP_CERT_CIPHER_SUITE_CV25519); - pgp_tpk_t tpk; + pgp_cert_t cert; pgp_signature_t revocation; - pgp_tpk_builder_generate (NULL, builder, &tpk, &revocation); - assert (tpk); + pgp_cert_builder_generate (NULL, builder, &cert, &revocation); + assert (cert); assert (revocation); pgp_signature_free (revocation); /* Free the generated revocation. */ @@ -27,12 +27,12 @@ main () { assert (armor); /* Finally, derive a TSK object, and serialize it. */ - pgp_tsk_t tsk = pgp_tpk_as_tsk (tpk); + pgp_tsk_t tsk = pgp_cert_as_tsk (cert); rc = pgp_tsk_serialize (NULL, tsk, armor); assert (rc == PGP_STATUS_SUCCESS); pgp_tsk_free (tsk); pgp_writer_free (armor); pgp_writer_free (sink); - pgp_tpk_free (tpk); + pgp_cert_free (cert); } diff --git a/openpgp-ffi/examples/reader.c b/openpgp-ffi/examples/reader.c index 13c47f69..ee72dcd9 100644 --- a/openpgp-ffi/examples/reader.c +++ b/openpgp-ffi/examples/reader.c @@ -20,21 +20,21 @@ main (int argc, char **argv) { pgp_error_t err; pgp_reader_t reader; - pgp_tpk_t tpk; + pgp_cert_t cert; if (argc != 2) error (1, 0, "Usage: %s ", argv[0]); reader = pgp_reader_from_file (&err, argv[1]); - tpk = pgp_tpk_from_reader (&err, reader); - if (tpk == NULL) - error (1, 0, "pgp_tpk_from_reader: %s", pgp_error_to_string (err)); + cert = pgp_cert_from_reader (&err, reader); + if (cert == NULL) + error (1, 0, "pgp_cert_from_reader: %s", pgp_error_to_string (err)); - char *debug = pgp_tpk_debug (tpk); + char *debug = pgp_cert_debug (cert); printf ("%s", debug); free (debug); - pgp_tpk_free (tpk); + pgp_cert_free (cert); pgp_reader_free (reader); return 0; } -- cgit v1.2.3