chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CREDITS: Credit Mark properly (!)
[secnet.git]
/
secnet.h
diff --git
a/secnet.h
b/secnet.h
index bd4362e1400fd30608f954a193dc3f8ac01da9e5..7da7c2d5a9935a7cd6bbb8285c8921faa7506594 100644
(file)
--- a/
secnet.h
+++ b/
secnet.h
@@
-46,8
+46,12
@@
#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 */
+#define MAX_NAK_MSG 80
+
+struct hash_if;
struct comm_if;
struct comm_addr;
struct comm_if;
struct comm_addr;
+struct priomsg;
typedef char *string_t;
typedef const char *cstring_t;
typedef char *string_t;
typedef const char *cstring_t;
@@
-377,6
+381,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,10
+422,15
@@
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;
};
sig_checksig_fn *check;
};
@@
-428,6
+442,7
@@
typedef bool_t sig_makesig_fn(void *st, uint8_t *data, int32_t datalen,
struct buffer_if *msg);
struct sigprivkey_if {
void *st;
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;
};
sig_makesig_fn *sign;
};
@@
-450,10
+465,18
@@
typedef struct comm_clientinfo *comm_clientinfo_fn(void *state, dict_t*,
* The semantics depend on the dict and defined by the comm, and
* should be documented in README. */
* The semantics depend on the dict and defined by the comm, and
* should be documented in README. */
+enum {
+ comm_notify_whynot_general,
+ comm_notify_whynot_unpick,
+ comm_notify_whynot_name_local,
+ comm_notify_whynot_name_remote,
+};
+
/* Return True if the packet was processed, and shouldn't be passed to
any other potential receivers. (buf is freed iff True returned.) */
typedef bool_t comm_notify_fn(void *state, struct buffer_if *buf,
/* Return True if the packet was processed, and shouldn't be passed to
any other potential receivers. (buf is freed iff True returned.) */
typedef bool_t comm_notify_fn(void *state, struct buffer_if *buf,
- const struct comm_addr *source);
+ const struct comm_addr *source,
+ struct priomsg *whynot);
typedef void comm_request_notify_fn(void *commst, void *nst,
comm_notify_fn *fn);
typedef void comm_release_notify_fn(void *commst, void *nst,
typedef void comm_request_notify_fn(void *commst, void *nst,
comm_notify_fn *fn);
typedef void comm_release_notify_fn(void *commst, void *nst,
@@
-631,11
+654,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;
@@
-646,7
+670,6
@@
struct hash_if {
struct buffer_if {
bool_t free;
cstring_t owner; /* Set to constant string */
struct buffer_if {
bool_t free;
cstring_t owner; /* Set to constant string */
- uint32_t flags; /* How paranoid should we be? */
struct cloc loc; /* Where we were defined */
uint8_t *base;
uint8_t *start;
struct cloc loc; /* Where we were defined */
uint8_t *base;
uint8_t *start;
@@
-716,7
+739,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).
*/