20070807-1541

Charles.Forsyth committed 19 years ago

Commit 1e6ba181 parent ac96fb45 files · +18 −7Browse files

Unified · Split

5 files

@@ -1,3 +1,6 @@
		1	20070807
		2	libinterp/keyring.c don't include owner= if owner is nil or ""
		3	add auth/rsagen
1	20070806	4	20070806
2	/module/lists.m add PATH(!), also simplify concat implementation	5	/module/lists.m add PATH(!), also simplify concat implementation
3	20070725	6	20070725

 	logind.dis\
 	mkauthinfo.dis\
 	passwd.dis\
-	secstore.dis\
+	rsagen.dis\
 	signer.dis\
 	verify.dis\
 	sys.m\
 	draw.m\
 	bufio.m\
-	secstore.m\
 	string.m\
 	styx.m\
 	styxservers.m\

@@ -1 +1 @@
1	#define VERSION "Fourth Edition (20070806)"	1	#define VERSION "Fourth Edition (20070807)"

 			mkauthinfo.b
 			mkfile
 			passwd.b
+			rsagen.b
 			secstore.b
 			signer.b
 			verify.b
 		touch.b
 		touchcal.b
 		tr.b
+		trfs.b
 		tsort.b
 		unicode.b
 		units.b
 	touch.dis
 	touchcal.dis
 	tr.dis
+	trfs.dis
 	tsort.dis
 	unicode.dis
 	uniq.dis

 Keyring_sktoattr(void *fp)
 {
 	F_Keyring_sktoattr *f;
-	char *val, *buf;
+	char *val, *buf, *owner;
 	SigAlg *sa;
 	Fmt o;
 	SK *sk;
 	}
 	(*sa->vec->sk2str)(sk->key, buf, Maxbuf);
 	fmtstrinit(&o);
-	fmtprint(&o, "alg=%q owner=%q", string2c(sa->x.name), string2c(sk->x.owner));
+	fmtprint(&o, "alg=%q", string2c(sa->x.name));
+	owner = string2c(sk->x.owner);
+	if(*owner)
+		fmtprint(&o, " owner=%q", owner);
 	val = bigs2attr(&o, buf, sa->vec->skattr);
 	free(buf);
 	retstr(val, f->ret);
 Keyring_pktoattr(void *fp)
 {
 	F_Keyring_pktoattr *f;
-	char *val, *buf;
+	char *val, *buf, *owner;
 	SigAlg *sa;
 	Fmt o;
 	PK *pk;
 	}
 	(*sa->vec->pk2str)(pk->key, buf, Maxbuf);
 	fmtstrinit(&o);
-	fmtprint(&o, "alg=%q owner=%q", string2c(sa->x.name), string2c(pk->x.owner));
+	fmtprint(&o, "alg=%q", string2c(sa->x.name));
+	owner = string2c(pk->x.owner);
+	if(*owner)
+		fmtprint(&o, " owner=%q", owner);
 	val = bigs2attr(&o, buf, sa->vec->pkattr);
 	free(buf);
 	retstr(val, f->ret);

Keyboard shortcuts