chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: udp-preload: Proof of concept wrapping
[secnet.git]
/
secnet.h
diff --git
a/secnet.h
b/secnet.h
index 99662a4135b37af90b4310a30e3879857b714dc3..eb8bf0cc011fc883980f90226f7fe7c90e56122d 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 */
#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;
struct comm_if;
struct comm_addr;
@@
-377,6
+378,11
@@
extern init_module log_module;
struct buffer_if;
struct buffer_if;
+struct alg_msg_data {
+ uint8_t *start;
+ int32_t len;
+};
+
/* PURE closure requires no interface */
/* RESOLVER interface */
/* PURE closure requires no interface */
/* RESOLVER interface */
@@
-413,18
+419,27
@@
struct random_if {
/* SIGPUBKEY interface */
/* 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,
typedef bool_t sig_checksig_fn(void *st, uint8_t *data, int32_t datalen,
- c
string_t signature
);
+ c
onst struct alg_msg_data *sig
);
struct sigpubkey_if {
void *st;
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 */
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;
struct sigprivkey_if {
void *st;
+ sig_sethash_fn *sethash; /* must be called before sign, if non-0 */
sig_makesig_fn *sign;
};
sig_makesig_fn *sign;
};
@@
-628,11
+643,12
@@
struct dh_if {
/* HASH interface */
/* HASH interface */
-typedef void
*hash_init_fn(void
);
+typedef void
hash_init_fn(void *st /* slen bytes alloc'd by caller */
);
typedef void hash_update_fn(void *st, const void *buf, int32_t len);
typedef void hash_update_fn(void *st, const void *buf, int32_t len);
-typedef void hash_final_fn(void *st, uint8_t *digest);
+typedef void hash_final_fn(void *st, uint8_t *digest
/* hlen bytes */
);
struct hash_if {
struct hash_if {
- int32_t len; /* Hash output length in bytes */
+ int32_t slen; /* State length in bytes */
+ int32_t hlen; /* Hash output length in bytes */
hash_init_fn *init;
hash_update_fn *update;
hash_final_fn *final;
hash_init_fn *init;
hash_update_fn *update;
hash_final_fn *final;
@@
-713,7
+729,7
@@
extern void log_from_fd(int fd, cstring_t prefix, struct log_if *log);
* void COPY_OBJ( OBJECT& dst, const OBJECT& src);
* void COPY_ARRAY(OBJECT *dst, const OBJECT *src, INTEGER count);
* // Typesafe: we check that the type OBJECT is the same in both cases.
* void COPY_OBJ( OBJECT& dst, const OBJECT& src);
* void COPY_ARRAY(OBJECT *dst, const OBJECT *src, INTEGER count);
* // Typesafe: we check that the type OBJECT is the same in both cases.
- * // It is OK to use COPY_OBJ on an array object, provided
it'
s
+ * // It is OK to use COPY_OBJ on an array object, provided
dst i
s
* // _actually_ the whole array object and not decayed into a
* // pointer (e.g. a formal parameter).
*/
* // _actually_ the whole array object and not decayed into a
* // pointer (e.g. a formal parameter).
*/