diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | appl/cmd/auth/mkfile | 3 | ||||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | lib/proto/inferno | 3 | ||||
| -rw-r--r-- | libinterp/keyring.c | 14 |
5 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,6 @@ +20070807 + libinterp/keyring.c don't include owner= if owner is nil or "" + add auth/rsagen 20070806 /module/lists.m add PATH(!), also simplify concat implementation 20070725 diff --git a/appl/cmd/auth/mkfile b/appl/cmd/auth/mkfile index 112ba66a..5782599e 100644 --- a/appl/cmd/auth/mkfile +++ b/appl/cmd/auth/mkfile @@ -15,7 +15,7 @@ TARG=\ logind.dis\ mkauthinfo.dis\ passwd.dis\ - secstore.dis\ + rsagen.dis\ signer.dis\ verify.dis\ @@ -27,7 +27,6 @@ SYSMODULES=\ sys.m\ draw.m\ bufio.m\ - secstore.m\ string.m\ styx.m\ styxservers.m\ diff --git a/include/version.h b/include/version.h index 35a9311a..fc249843 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20070806)" +#define VERSION "Fourth Edition (20070807)" diff --git a/lib/proto/inferno b/lib/proto/inferno index 93c252b9..f710f8e7 100644 --- a/lib/proto/inferno +++ b/lib/proto/inferno @@ -376,6 +376,7 @@ appl mkauthinfo.b mkfile passwd.b + rsagen.b secstore.b signer.b verify.b @@ -743,6 +744,7 @@ appl touch.b touchcal.b tr.b + trfs.b tsort.b unicode.b units.b @@ -1827,6 +1829,7 @@ dis touch.dis touchcal.dis tr.dis + trfs.dis tsort.dis unicode.dis uniq.dis diff --git a/libinterp/keyring.c b/libinterp/keyring.c index 9182773a..20ce610c 100644 --- a/libinterp/keyring.c +++ b/libinterp/keyring.c @@ -368,7 +368,7 @@ void Keyring_sktoattr(void *fp) { F_Keyring_sktoattr *f; - char *val, *buf; + char *val, *buf, *owner; SigAlg *sa; Fmt o; SK *sk; @@ -383,7 +383,10 @@ Keyring_sktoattr(void *fp) } (*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); @@ -577,7 +580,7 @@ void Keyring_pktoattr(void *fp) { F_Keyring_pktoattr *f; - char *val, *buf; + char *val, *buf, *owner; SigAlg *sa; Fmt o; PK *pk; @@ -592,7 +595,10 @@ Keyring_pktoattr(void *fp) } (*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); |