sig: Move hashing into algorithm

[secnet.git] / secnet.h

diff --git a/secnet.h b/secnet.h
index 99662a4135b37af90b4310a30e3879857b714dc3..cdeadad1d2cc8e171f3168d9baf53dc84da36696 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -46,6 +46,7 @@
 #define MAX_PEER_ADDRS 5
 /* send at most this many copies; honour at most that many addresses */
 
+struct hash_if;
 struct comm_if;
 struct comm_addr;
 
@@ -377,6 +378,11 @@ extern init_module log_module;
 
 struct buffer_if;
 
+struct alg_msg_data {
+    uint8_t *sigstart;
+    int32_t siglen;
+};
+
 /* PURE closure requires no interface */
 
 /* RESOLVER interface */
@@ -413,18 +419,27 @@ struct random_if {
 
 /* SIGPUBKEY interface */
 
+typedef void sig_sethash_fn(void *st, struct hash_if *hash);
+typedef bool_t sig_unpick_fn(void *sst, struct buffer_if *msg,
+                            struct alg_msg_data *sig);
 typedef bool_t sig_checksig_fn(void *st, uint8_t *data, int32_t datalen,
-                              cstring_t signature);
+                              const struct alg_msg_data *sig);
 struct sigpubkey_if {
     void *st;
+    sig_sethash_fn *sethash; /* must be called before check, if non-0 */
+    sig_unpick_fn *unpick;
     sig_checksig_fn *check;
 };
 
 /* SIGPRIVKEY interface */
 
-typedef string_t sig_makesig_fn(void *st, uint8_t *data, int32_t datalen);
+/* Appends the signature to msg.
+ * Can fail and returnn False, eg if the buffer is too small. */
+typedef bool_t sig_makesig_fn(void *st, uint8_t *data, int32_t datalen,
+                             struct buffer_if *msg);
 struct sigprivkey_if {
     void *st;
+    sig_sethash_fn *sethash; /* must be called before sign, if non-0 */
     sig_makesig_fn *sign;
 };