X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/0c1cede3374c0e3110303fc031698c37d2450469..f6994bd047a35b06aa7aed3c59487000abec2325:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index 940e3d61..c796d073 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -402,6 +402,7 @@ struct algswitch {
 struct kdata {
   unsigned ref;				/* Reference counter */
   struct knode *kn;			/* Pointer to cache entry */
+  uint32 id;				/* The underlying key's id */
   char *tag;				/* Full tag name of the key */
   dhgrp *grp;				/* The group we work in */
   dhsc *k;				/* The private key (or null) */
@@ -827,6 +828,19 @@ extern int km_reload(void);
 extern kdata *km_findpub(const char */*tag*/);
 extern kdata *km_findpriv(const char */*tag*/);
 
+/* --- @km_findpubbyid@, @km_findprivbyid@ --- *
+ *
+ * Arguments:	@uint32 id@ = key id to load
+ *
+ * Returns:	Pointer to the kdata object if successful, or null on error.
+ *
+ * Use:		Fetches a public or private key from the keyring given its
+ *		numeric id.
+ */
+
+extern kdata *km_findpubbyid(uint32 /*id*/);
+extern kdata *km_findprivbyid(uint32 /*id*/);
+
 /* --- @km_samealgsp@ --- *
  *
  * Arguments:	@const kdata *kdx, *kdy@ = two key data objects
@@ -889,16 +903,18 @@ extern void kx_start(keyexch */*kx*/, int /*forcep*/);
 /* --- @kx_message@ --- *
  *
  * Arguments:	@keyexch *kx@ = pointer to key exchange context
+ *		@const addr *a@ = sender's IP address and port
  *		@unsigned msg@ = the message code
  *		@buf *b@ = pointer to buffer containing the packet
  *
- * Returns:	---
+ * Returns:	Nonzero if the sender's address was unknown.
  *
  * Use:		Reads a packet containing key exchange messages and handles
  *		it.
  */
 
-extern void kx_message(keyexch */*kx*/, unsigned /*msg*/, buf */*b*/);
+extern int kx_message(keyexch */*kx*/, const addr */*a*/,
+		      unsigned /*msg*/, buf */*b*/);
 
 /* --- @kx_free@ --- *
  *