Refactor pgp_subsig_t to rnp::Signature

rnpgp · Feb 24, 2025 · cb6409c · cb6409c
1 parent 4c939e0
commit cb6409c
Show file tree

Hide file tree

Showing 14 changed files with 266 additions and 229 deletions.
diff --git a/include/rekey/rnp_key_store.h b/include/rekey/rnp_key_store.h
@@ -190,10 +190,10 @@ class KeyStore {
      * @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);
+    rnp::Signature *add_key_sig(const pgp_fingerprint_t &keyfp,
+                                const pgp_signature_t &  sig,
+                                const pgp_userid_pkt_t * uid,
+                                bool                     front);
 
     /**
      * @brief Add transferable key to the keystore.

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -373,6 +373,7 @@ add_library(librnp-obj OBJECT
   key_material.cpp
   enc_material.cpp
   sig_material.cpp
+  signature.cpp
   keygen.cpp
   pgp-key.cpp
   rnp.cpp

diff --git a/src/lib/ffi-priv-types.h b/src/lib/ffi-priv-types.h
@@ -57,7 +57,7 @@ struct rnp_signature_handle_st {
      * @brief Key to which this signature belongs, if available.
      */
     const pgp_key_t *key;
-    pgp_subsig_t *   sig;
+    rnp::Signature * sig;
     /**
      * @brief sig pointer is owned by structure and should be deallocated.
      */
@@ -69,7 +69,7 @@ struct rnp_signature_handle_st {
 
     rnp_signature_handle_st(rnp_ffi_t        affi,
                             const pgp_key_t *akey = nullptr,
-                            pgp_subsig_t *   asig = nullptr,
+                            rnp::Signature * asig = nullptr,
                             bool             aown_sig = false,
                             bool             anew_sig = false)
         : ffi(affi), key(akey), sig(asig), own_sig(aown_sig), new_sig(anew_sig)