20110117-1110

2 files changed, 9 insertions, 9 deletions

diff --git a/module/factotum.m b/module/factotum.m
index beb238cc..5d1df5f8 100644
--- a/module/factotum.m
+++ b/module/factotum.m
@@ -9,10 +9,10 @@ Factotum: module
 		suid:	string;	# server id
 		cap:	string;	# capability (only valid on server side)
 		secret:	array of byte;
-		attrs:	list of ref Attr;		# attributes after authentication
+		# TO DO: add attrs
 
-		unpack:	fn(a: array of byte): (int, ref Authinfo);	# excludes attributes
-		read:	fn(facfd: ref Sys->FD): ref Authinfo;	# includes attributes
+		unpack:	fn(a: array of byte): (int, ref Authinfo);
+		read:	fn(fd: ref Sys->FD): ref Authinfo;
 	};
 
 	mount:	fn(fd: ref Sys->FD, mnt: string, flags: int, aname: string, keyspec: string): (int, ref Authinfo);
diff --git a/module/spki.m b/module/spki.m
index 3ddeb661..fbb82ba7 100644
--- a/module/spki.m
+++ b/module/spki.m
@@ -37,8 +37,8 @@ SPKI: module
 	};
 
 	Key: adt {
-		pk:	ref Crypt->PK;	# either pk/sk or hash might be nil
-		sk:	ref Crypt->SK;
+		pk:	ref Keyring->PK;	# either pk/sk or hash might be nil
+		sk:	ref Keyring->SK;
 		nbits:	int;
 		halg:	string;	# basic signature hash algorithm
 		henc:	string;	# pre-signature encoding
@@ -49,9 +49,9 @@ SPKI: module
 		ishash:	fn(k: self ref Key): int;
 		public:	fn(k: self ref Key): ref Key;
 		sigalg:	fn(k: self ref Key): string;
-		text:		fn(k: self ref Key): string;
+		text:	fn(k: self ref Key): string;
 		sexp:	fn(k: self ref Key): ref Sexprs->Sexp;
-		eq:		fn(k1: self ref Key, k2: ref Key): int;
+		eq:	fn(k1: self ref Key, k2: ref Key): int;
 	};
 
 	Name: adt {
@@ -120,7 +120,7 @@ SPKI: module
 		hash:	ref Hash;
 		key:	ref Key;	# find by hash if necessary
 		sa:	string;	# alg[-[encoding-]hash]
-		params:	array of (string, array of byte);
+		sig:	list of (string, array of byte);
 
 		algs:	fn(s: self ref Signature): (string, string, string);
 		sexp:	fn(s: self ref Signature): ref Sexprs->Sexp;
@@ -197,7 +197,7 @@ SPKI: module
 
 	# signature checking
 	checksig:	fn(c: ref Cert, sig: ref Signature): string;
-	#sig2icert:	fn(sig: ref Signature, signer: string, exp: int): ref Oldauth->Certificate;
+	sig2icert:	fn(sig: ref Signature, signer: string, exp: int): ref Keyring->Certificate;
 
 	# signature making
 	signcert:	fn(c: ref Cert, sigalg: string, key: ref Key): (ref Signature, string);