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	4	20070806
2	5	/module/lists.m add PATH(!), also simplify concat implementation
3	6	20070725

@@ -15,7 +15,7 @@ TARG=\ · 14 unmodified lines
15	15	logind.dis\
16	16	mkauthinfo.dis\
17	17	passwd.dis\
18		− secstore.dis\
	18	+ rsagen.dis\
19	19	signer.dis\
20	20	verify.dis\
21	21
@@ -27,7 +27,6 @@ SYSMODULES=\ · 5 unmodified lines
27	27	sys.m\
28	28	draw.m\
29	29	bufio.m\
30		− secstore.m\
31	30	string.m\
32	31	styx.m\
33	32	styxservers.m\

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

@@ -368,7 +368,7 @@ void · 367 unmodified lines
368	368	Keyring_sktoattr(void *fp)
369	369	{
370	370	F_Keyring_sktoattr *f;
371		− char val, buf;
	371	+ char val, buf, *owner;
372	372	SigAlg *sa;
373	373	Fmt o;
374	374	SK *sk;
@@ -383,7 +383,10 @@ Keyring_sktoattr(void *fp) · 8 unmodified lines
383	383	}
384	384	(*sa->vec->sk2str)(sk->key, buf, Maxbuf);
385	385	fmtstrinit(&o);
386		− fmtprint(&o, "alg=%q owner=%q", string2c(sa->x.name), string2c(sk->x.owner));
	386	+ fmtprint(&o, "alg=%q", string2c(sa->x.name));
	387	+ owner = string2c(sk->x.owner);
	388	+ if(*owner)
	389	+ fmtprint(&o, " owner=%q", owner);
387	390	val = bigs2attr(&o, buf, sa->vec->skattr);
388	391	free(buf);
389	392	retstr(val, f->ret);
@@ -577,7 +580,7 @@ void · 187 unmodified lines
577	580	Keyring_pktoattr(void *fp)
578	581	{
579	582	F_Keyring_pktoattr *f;
580		− char val, buf;
	583	+ char val, buf, *owner;
581	584	SigAlg *sa;
582	585	Fmt o;
583	586	PK *pk;
@@ -592,7 +595,10 @@ Keyring_pktoattr(void *fp) · 8 unmodified lines
592	595	}
593	596	(*sa->vec->pk2str)(pk->key, buf, Maxbuf);
594	597	fmtstrinit(&o);
595		− fmtprint(&o, "alg=%q owner=%q", string2c(sa->x.name), string2c(pk->x.owner));
	598	+ fmtprint(&o, "alg=%q", string2c(sa->x.name));
	599	+ owner = string2c(pk->x.owner);
	600	+ if(*owner)
	601	+ fmtprint(&o, " owner=%q", owner);
596	602	val = bigs2attr(&o, buf, sa->vec->pkattr);
597	603	free(buf);
598	604	retstr(val, f->ret);

Keyboard shortcuts