Update FFI API with key certification and signature customization functions.

include/rekey/rnp_key_store.h

@@ -179,16 +179,20 @@ class KeyStore {
 
  /**
  * @brief Add signature of the specific key to the keystore, revalidating and refresing
- * key's data. Currently supports only direct-key or subkey binding signature.
+ * key's data.
  *
  * @param keyfp key's fingerprint.
  * @param sig signature packet.
+ * @param uid userid to which signature should be attached. If NULL then signature will be
+ * attached directly to the key.
  * @param front set to true if signature should be added to the beginning of the signature
  * list.
- * @return pointer to the newly added signature or NULL if failed.
+ * @return pointer to the newly added signature or nullptr if error occurred (key not
+ * found, whatever else).
  */
  pgp_subsig_t *add_key_sig(const pgp_fingerprint_t &keyfp,
  const pgp_signature_t & sig,
+ const pgp_userid_pkt_t * uid,
  bool front);
 
  /**

src/lib/pgp-key.cpp

@@ -1064,6 +1064,17 @@
  return false;
 }
 
+uint32_t
+pgp_key_t::uid_idx(const pgp_userid_pkt_t &uid) const
+{
+ for (uint32_t idx = 0; idx < uids_.size(); idx++) {
+ if (uids_[idx].pkt == uid) {
+ return idx;
+ }
+ }
+ return PGP_UID_NONE;
+}
+
 void
 pgp_key_t::del_uid(size_t idx)
 {

src/lib/pgp-key.h

@@ -201,6 +201,7 @@ struct pgp_key_t {
  size_t get_uid_idx(const pgp_userid_pkt_t &uid) const;
  pgp_userid_t & add_uid(const pgp_transferable_userid_t &uid);
  bool has_uid(const std::string &uid) const;
+ uint32_t uid_idx(const pgp_userid_pkt_t &uid) const;
  void del_uid(size_t idx);
  bool has_primary_uid() const;
  uint32_t get_primary_uid() const;