test-example: Use subdirmk's new &:macro feature

[secnet.git] / README

diff --git a/README b/README
index e83b66d905a6c9734b8db45d647a9af53c5a2f7d..e23701c9151dc4d946523914dbbf81b2a69251fa 100644 (file)
--- a/README
+++ b/README
@@ -393,14 +393,14 @@ site: dict argument
   resolver (resolver closure)
   random (randomsrc closure)
   key-cache (privcache closure)
-  local-key (rsaprivkey closure): Deprecated; use key-cache instead.
+  local-key (sigprivkey closure): Deprecated; use key-cache instead.
   address (string list): optional, DNS name(s) used to find our peer;
     address literals are supported too if enclosed in `[' `]'.
   port (integer): mandatory if 'address' is specified: the port used
     to contact our peer
   peer-keys (string): path (prefix) for peer public key set file(s);
-    see README.make-secnet-sites re `pub' etc.
-  key (rsapubkey closure): our peer's public key (obsolete)
+    see README.make-secnet-sites re `pub' etc. and NOTES.peer-keys.
+  key (sigpubkey closure): our peer's public key (obsolete)
   transform (transform closure): how to mangle packets sent between sites
   dh (dh closure)
   hash (hash closure): used for keys whose algorithm (or public
@@ -577,12 +577,21 @@ priv-cache: dict argument
   privkey-max (integer): optional, maximum size of private key
     file in bytes. [4095]
 
+** pubkeys
+
+Defines:
+  make-public (closure => sigpubkey closure)
+
+make-public: (
+  arg1: sigscheme name
+  arg2: base91s encoded public key data, according to algorithm
+
 ** rsa
 
 Defines:
   sigscheme algorithm 00 "rsa1"
-  rsa-private (closure => rsaprivkey closure)
-  rsa-public (closure => rsapubkey closure)
+  rsa-private (closure => sigprivkey closure)
+  rsa-public (closure => sigpubkey closure)
 
 rsa1 sigscheme algorithm:
   private key: SSH private key file, version 1, no password