summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/include/sequoia/openpgp.h
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-06-17 08:51:31 +0200
committerNeal H. Walfield <neal@pep.foundation>2020-06-17 08:55:35 +0200
commit06db1756bbb0ff0f3e8f9f7c4b8ca9d2e1b70d7c (patch)
tree4c0acabd9d0cb947130d9b2cbe2d5bb1f2b5b4a5 /openpgp-ffi/include/sequoia/openpgp.h
parent6db1fb039a40aa8a25d97b41e2eb17e339bff8fe (diff)
openpgp-ffi: Change return type.
- Change `pgp_user_id_amalgamation_user_id` and `pgp_valid_user_id_amalgamation_user_id` to return a `pgp_packet_t`, not a `pgp_user_id_t`. - Most functions work with `pgp_packet_t`s, not `pgp_user_id_t`s.
Diffstat (limited to 'openpgp-ffi/include/sequoia/openpgp.h')
-rw-r--r--openpgp-ffi/include/sequoia/openpgp.h16
1 files changed, 4 insertions, 12 deletions
diff --git a/openpgp-ffi/include/sequoia/openpgp.h b/openpgp-ffi/include/sequoia/openpgp.h
index 580134ee..396cbf95 100644
--- a/openpgp-ffi/include/sequoia/openpgp.h
+++ b/openpgp-ffi/include/sequoia/openpgp.h
@@ -573,15 +573,11 @@ void pgp_literal_free (pgp_literal_t literal);
/* openpgp::amalgamation::UserIDAmalgamation. */
/*/
-/// Returns the user id.
-///
-/// This function may fail and return NULL if the user id contains an
-/// interior NUL byte. We do this rather than complicate the API, as
-/// there is no valid use for such user ids; they must be malicious.
+/// Returns a copy of the user id.
///
/// The caller must free the returned value.
/*/
-char *pgp_user_id_amalgamation_user_id (pgp_user_id_amalgamation_t ua);
+pgp_packet_t pgp_user_id_amalgamation_user_id (pgp_user_id_amalgamation_t ua);
/*/
/// Frees the User ID Amalgamation.
@@ -600,15 +596,11 @@ pgp_user_id_amalgamation_t pgp_user_id_amalgamation_clone (pgp_user_id_amalgamat
char *pgp_user_id_amalgamation_debug (const pgp_user_id_amalgamation_t ua);
/*/
-/// Returns the user id.
-///
-/// This function may fail and return NULL if the user id contains an
-/// interior NUL byte. We do this rather than complicate the API, as
-/// there is no valid use for such user ids; they must be malicious.
+/// Returns a copy of the user id.
///
/// The caller must free the returned value.
/*/
-pgp_user_id_t pgp_valid_user_id_amalgamation_user_id
+pgp_packet_t pgp_valid_user_id_amalgamation_user_id
(pgp_valid_user_id_amalgamation_t ua);
/*/