Added auth/* programs.

Revisited

Change-Id: I64b7ebc3cc1744461d6d9722472adad38ce7a215

sys/src/cmd/auth/as.c

@@ -23,7 +23,7 @@ int	debug;
 
 int	becomeuser(char*);
 void	createuser(void);
-void	*emalloc(ulong);
+void	*emalloc(uint32_t);
 void	*erealloc(void*, uint32_t);
 void	initcap(void);
 int	mkcmd(char*, char*, int);

sys/src/cmd/auth/asn12dsa.c

@@ -24,9 +24,9 @@ void
 main(int argc, char **argv)
 {
 	char *s;
-	uchar *buf;
+	unsigned char *buf;
 	int fd;
-	long n, tot;
+	int32_t n, tot;
 	char *tag, *file;
 	DSApriv *key;
 

sys/src/cmd/auth/asn12rsa.c

@@ -24,9 +24,9 @@ void
 main(int argc, char **argv)
 {
 	char *s;
-	uchar *buf;
+	unsigned char *buf;
 	int fd;
-	long n, tot;
+	int32_t n, tot;
 	char *tag, *file;
 	RSApriv *key;
 

sys/src/cmd/auth/auth.json

@@ -0,0 +1,51 @@
+{
+	"Name": "Auth",
+	"Projects": [
+	"factotum/factotum.json",
+	"secstore/secstore.json",
+	"lib/libauthcmd.json",
+	"authsrv.json",
+	"dsa2pub.json",
+	"dsa2ssh.json",
+	"guard.srv.json",
+	"rsa2csr.json",
+	"rsa2pub.json", 
+	"rsa2ssh.json",
+	"rsa2x509.json",
+	"rsafill.json"
+	],
+	"Include": ["../cmd.json"],
+	"Pre": [
+	],
+	"SourceFilesCmd": [
+	"as.c",
+	"asn12dsa.c",
+	"asn12rsa.c",
+	"changeuser.c",
+	"convkeys2.c",
+	"convkeys.c",
+	"cron.c",
+	"debug.c",
+	"dsagen.c",
+	"keyfs.c",
+	"login.c",
+	"netkey.c",
+	"newns.c",
+	"none.c",
+	"passwd.c",
+	"pemdecode.c",
+	"pemencode.c",
+	"printnetkey.c",
+	"readnvram.c",
+	"rsagen.c",
+	"uniq.c",
+	"warning.c",
+	"wrkey.c"
+	],
+	"Oflags": [
+	"lib/libauthcmd.a"
+	],
+	"Post": [
+	],
+	"Install": "/$ARCH/bin/auth/"
+}

sys/src/cmd/auth/authcmdlib.h

@@ -51,25 +51,25 @@ void	fail(char*);
 char*	findkey(char*, char*, char*);
 char*	findsecret(char*, char*, char*);
 int	getauthkey(char*);
-long	getexpiration(char *db, char *u);
+int32_t	getexpiration(char *db, char *u);
 void	getpass(char*, char*, int, int);
 int	getsecret(int, char*);
 int	keyfmt(Fmt*);
 void	logfail(char*);
-int	netcheck(void*, long, char*);
+int	netcheck(void*, int32_t, char*);
 char*	netdecimal(char*);
-char*	netresp(char*, long, char*);
+char*	netresp(char*, int32_t, char*);
 char*	okpasswd(char*);
 int	querybio(char*, char*, Acctbio*);
 void	rdbio(char*, char*, Acctbio*);
 int	readarg(int, char*, int);
 int	readfile(char*, char*, int);
 void	readln(char*, char*, int, int);
-long	readn(int, void*, long);
+int32_t	readn(int, void*, int32_t);
 char*	secureidcheck(char*, char*);
 char*	setkey(char*, char*, char*);
 char*	setsecret(char*, char*, char*);
-int	smartcheck(void*, long, char*);
+int	smartcheck(void*, int32_t, char*);
 void	succeed(char*);
 void	wrbio(char*, Acctbio*);
 int	writefile(char*, char*, int);

sys/src/cmd/auth/authsrv.json

@@ -0,0 +1,17 @@
+{
+    "Name": "authsrv",
+    "Program": "authsrv",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "authsrv.c",
+    "secureidcheck.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv authsrv $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/changeuser.c

@@ -29,7 +29,7 @@ main(int argc, char *argv[])
 {
 	char *u, key[DESKEYLEN], answer[32], p9pass[32];
 	int which, i, newkey, newbio, dosecret;
-	long t;
+	int32_t t;
 	Acctbio a;
 	Fs *f;
 

sys/src/cmd/auth/cron.c

@@ -158,7 +158,7 @@ main(int argc, char *argv[])
 	Job *j;
 	Tm tm;
 	Time t;
-	ulong now, last;		/* in seconds */
+	uint32_t now, last;		/* in seconds */
 	int i, lock;
 
 	debug = 0;

sys/src/cmd/auth/dsa2pub.json

@@ -0,0 +1,17 @@
+{
+    "Name": "dsa2pub",
+    "Program": "dsa2pub",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "dsa2pub.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv dsa2pub $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/dsa2ssh.c

@@ -26,7 +26,7 @@ main(int argc, char **argv)
 {
 	DSApriv *k;
 	char *comment;
-	uchar buf[8192], *p;
+	unsigned char buf[8192], *p;
 	
 	fmtinstall('B', mpfmt);
 	fmtinstall('[', encodefmt);

sys/src/cmd/auth/dsa2ssh.json

@@ -0,0 +1,17 @@
+{
+    "Name": "dsa2ssh",
+    "Program": "dsa2ssh",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "dsa2ssh.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv dsa2ssh $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/factotum/BUILDKFACTOTUM

@@ -1,35 +0,0 @@
-#!/bin/bash
-set -e
-
-CC=gcc
-CFLAGS="-mcmodel=small -O0 -fplan9-extensions -ffreestanding -fno-builtin -Wall -Wno-missing-braces -Wno-parentheses -Wno-unknown-pragmas -Wuninitialized -Wmaybe-uninitialized -I/amd64/include -I/sys/include -c -g "
-LIB_DIR="/amd64/lib"
-LDFLAGS=-L${LIB_DIR}
-LD=ld
-
-rm -f *.o
-$CC $CFLAGS -c \
-apop.c \
-chap.c \
-confirm.c \
-fs.c \
-httpdigest.c \
-log.c \
-p9any.c \
-p9cr.c \
-p9sk1.c \
-pass.c \
-rpc.c \
-rsa.c \
-secstore.c \
-util.c \
-wep.c \
-hack.S \
-
-echo "linking.."
-echo
-$LD -static -o factotum.elf.out *.o $LDFLAGS -l9p -lauth -lauthsrv -lndb -lsec -lString -lthread -lmp -lip -lc -emain -Ttext=0x200020
-
-$CC $CFLAGS -c fgui.c 
-$LD -static -o fgui.elf.out fgui.o $LDFLAGS -lcontrol -ldraw -l9p -lauth -lauthsrv -lndb -lsec -lString -lthread -lmp -lip -lc -emain -Ttext=0x200020
-rm *.o

sys/src/cmd/auth/factotum/confirm.c

@@ -25,7 +25,7 @@ confirmflush(Req *r)
 {
 	Req **l;
 
-	for(l=&cusewait; *l; l=&(*l)->aux){
+	for(l=(Req **)cusewait; *l; l=(Req **)(*l)->aux){
 		if(*l == r){
 			*l = r->aux;
 			if(r->aux == nil)
@@ -84,7 +84,7 @@ confirmwrite(char *s)
 	}
 	r = nil;
 	tagoff = -1;
-	for(l=&cusewait; *l; l=&(*l)->aux){
+	for(l=(Req **)cusewait; *l; l=(Req **)(*l)->aux){
 		r = *l;
 		if(hastag(r->fid->aux, tag, &tagoff)){
 			*l = r->aux;
@@ -127,7 +127,7 @@ confirmqueue(Req *r, Fsstate *fss)
 	}
 	*cuselast = r;
 	r->aux = nil;
-	cuselast = &r->aux;
+	cuselast = (Req **)r->aux;
 }
 
 /* Yes, I am unhappy that the code below is a copy of the code above. */
@@ -147,7 +147,7 @@ needkeyflush(Req *r)
 {
 	Req **l;
 
-	for(l=&needwait; *l; l=&(*l)->aux){
+	for(l=(Req **)needwait; *l; l=(Req **)(*l)->aux){
 		if(*l == r){
 			*l = r->aux;
 			if(r->aux == nil)
@@ -178,7 +178,7 @@ needkeywrite(char *s)
 	}
 	tag = strtoul(t, 0, 0);
 	r = nil;
-	for(l=&needwait; *l; l=&(*l)->aux){
+	for(l=(Req **)needwait; *l; l=(Req **)(*l)->aux){
 		r = *l;
 		if(r->tag == tag){
 			*l = r->aux;
@@ -207,7 +207,7 @@ needkeyqueue(Req *r, Fsstate *fss)
 	logbufappend(&needkeybuf, msg);
 	*needlast = r;
 	r->aux = nil;
-	needlast = &r->aux;
+	needlast = (Req **)r->aux;
 	return 0;
 }
 

sys/src/cmd/auth/factotum/factotum.json

@@ -0,0 +1,28 @@
+{
+    "Name": "factotum",
+    "Program": "factotum",
+    "Include": ["../../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "apop.c",
+    "chap.c",
+    "confirm.c",
+    "fs.c",
+    "httpdigest.c",
+    "log.c",
+    "p9any.c",
+    "p9cr.c",
+    "p9sk1.c",
+    "pass.c",
+    "rpc.c",
+    "rsa.c",
+    "secstore.c",
+    "util.c",
+    "wep.c"
+	],
+	"Post": [
+    "mkdir -p $HARVEY/amd64/bin/auth",
+    "mv factotum $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/factotum/hack.S

@@ -1,17 +0,0 @@
-.globl mpvecadd
-mpvecadd:
-.globl mpvecsub
-mpvecsub:
-.globl mpkaratsuba
-mpkaratsuba:
-.globl mpvecdigmuladd
-mpvecdigmuladd:
-.globl mpdiv
-mpdiv:
-.globl mpdigdiv
-mpdigdiv:
-.globl mpvecdigmuladd
-mpvecdigmuladd:
-.globl mpvecdigmulsub
-mpvecdigmulsub:
-

sys/src/cmd/auth/factotum/log.c

@@ -55,7 +55,7 @@ logbufread(Logbuf *lb, Req *r)
 	if(lb->waitlast == nil)
 		lb->waitlast = &lb->wait;
 	*(lb->waitlast) = r;
-	lb->waitlast = &r->aux;
+	lb->waitlast = (Req **)r->aux;
 	r->aux = nil;
 	logbufproc(lb);
 }
@@ -65,7 +65,7 @@ logbufflush(Logbuf *lb, Req *r)
 {
 	Req **l;
 
-	for(l=&lb->wait; *l; l=&(*l)->aux){
+	for(l=(Req **)lb->wait; *l; l=(Req **)(*l)->aux){
 		if(*l == r){
 			*l = r->aux;
 			r->aux = nil;

sys/src/cmd/auth/factotum/mkfile

@@ -1,44 +0,0 @@
-</$objtype/mkfile
-
-TARG=factotum\
-	fgui\
-
-PROTO=\
-	apop.$O\
-	chap.$O\
-	httpdigest.$O\
-	p9any.$O\
-	p9cr.$O\
-	p9sk1.$O\
-	pass.$O\
-	rsa.$O\
-	wep.$O\
-
-FOFILES=\
-	$PROTO\
-	confirm.$O\
-	fs.$O\
-	log.$O\
-	rpc.$O\
-	util.$O\
-	secstore.$O\
-
-HFILES=\
-	dat.h\
-
-LIB=/$objtype/lib/libauth.a /$objtype/lib/libauthsrv.a
-BIN=/$objtype/bin/auth
-
-UPDATE=\
-	mkfile\
-	$HFILES\
-	${FOFILES:%.$O=%.c}\
-	fgui.c\
-
-</sys/src/cmd/mkmany
-
-$O.factotum: $FOFILES
-	$LD -o $target $prereq
-
-$O.fgui: fgui.$O
-	$LD -o $target $prereq

sys/src/cmd/auth/guard.srv.c

@@ -41,7 +41,7 @@ void
 main(int argc, char *argv[])
 {
 	int n;
-	long chal;
+	int32_t chal;
 	char *err;
 	char ukey[DESKEYLEN], resp[32], buf[NETCHLEN];
 	Ndb *db2;
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
 void
 catchalarm(void *x, char *msg)
 {
-	USED(x, msg);
+	USED(x); USED(msg);
 	if(debug)
 		syslog(0, AUTHLOG, "g-timed out %s", raddr);
 	fail(0);

sys/src/cmd/auth/guard.srv.json

@@ -0,0 +1,17 @@
+{
+    "Name": "guard.srv",
+    "Program": "guard.srv",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "guard.srv.c",
+    "secureidcheck.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv guard.srv $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/keyfs.c

@@ -22,7 +22,7 @@
 
 #pragma	varargck	type	"W"	char*
 
-int8_t authkey[8];
+char authkey[8];
 
 typedef struct Fid	Fid;
 typedef struct User	User;
@@ -208,7 +208,7 @@ Flush(Fid *f)
 }
 
 char *
-Auth(Fid *)
+Auth(Fid *f)
 {
 	return "keyfs: authentication not required";
 }
@@ -226,7 +226,7 @@ Attach(Fid *f)
 }
 
 char*
-Version(Fid*)
+Version(Fid *g)
 {
 	Fid *f;
 

sys/src/cmd/auth/lib/libauthcmd.json

@@ -0,0 +1,30 @@
+{
+	"Name": "libauthcmd",
+	"Library": "libauthcmd.a",
+	"Include": ["../../../lib.json"],
+	"Pre": [
+	"rm *.a"
+	],
+    "SourceFiles": [
+	"keyfmt.c",
+	"netcheck.c",
+	"okpasswd.c",
+	"readwrite.c",
+	"readarg.c",
+	"readln.c",
+	"getauthkey.c",
+	"log.c",
+	"error.c",
+	"fs.c",
+	"rdbio.c",
+	"querybio.c",
+	"wrbio.c",
+	"getexpiration.c"
+	],
+	"Cflags": [
+    "-I../"
+    ],
+	"Post": [
+	"ar rv $HARVEY/sys/src/cmd/auth/lib/libauthcmd.a *.o"
+	]
+}

sys/src/cmd/auth/pemdecode.c

@@ -24,9 +24,9 @@ void
 main(int argc, char **argv)
 {
 	char *buf;
-	uchar *bin;
+	unsigned char *bin;
 	int fd;
-	long n, tot;
+	int32_t n, tot;
 	int len;
 	char *tag, *file;
 

sys/src/cmd/auth/pemencode.c

@@ -25,7 +25,7 @@ main(int argc, char **argv)
 {
 	char *buf, *cbuf;
 	int fd;
-	long n, tot;
+	int32_t n, tot;
 	int len;
 	char *tag, *file;
 
@@ -61,7 +61,7 @@ main(int argc, char **argv)
 	cbuf = malloc(2*tot);
 	if(cbuf == nil)
 		sysfatal("malloc: %r");
-	len = enc64(cbuf, 2*tot, (uchar*)buf, tot);
+	len = enc64(cbuf, 2*tot, (unsigned char*)buf, tot);
 	print("-----BEGIN %s-----\n", tag);
 	while(len > 0){
 		print("%.64s\n", cbuf);

sys/src/cmd/auth/readnvram.c

@@ -14,7 +14,7 @@
 #include <authsrv.h>
 
 void
-main(int, char **)
+main(int n, char **g)
 {
 	int i;
 	Nvrsafe safe;

sys/src/cmd/auth/rsa2any.h

@@ -9,7 +9,7 @@
 
 DSApriv*getdsakey(int argc, char **argv, int needprivate, Attr **pa);
 RSApriv*getkey(int argc, char **argv, int needprivate, Attr **pa);
-uchar*	put4(uchar *p, uint n);
-uchar*	putmp2(uchar *p, mpint *b);
-uchar*	putn(uchar *p, void *v, uint n);
-uchar*	putstr(uchar *p, char *s);
+unsigned char*	put4(unsigned char *p, uint n);
+unsigned char*	putmp2(unsigned char *p, mpint *b);
+unsigned char*	putn(unsigned char *p, void *v, uint n);
+unsigned char*	putstr(unsigned char *p, char *s);

sys/src/cmd/auth/rsa2csr.c

@@ -26,7 +26,7 @@ void
 main(int argc, char **argv)
 {
 	int len;
-	uchar *cert;
+	unsigned char *cert;
 	RSApriv *key;
 
 	fmtinstall('B', mpfmt);

sys/src/cmd/auth/rsa2csr.json

@@ -0,0 +1,17 @@
+{
+    "Name": "rsa2csr",
+    "Program": "rsa2csr",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "rsa2csr.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv rsa2csr $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/rsa2pub.json

@@ -0,0 +1,17 @@
+{
+    "Name": "rsa2pub",
+    "Program": "rsa2pub",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "rsa2pub.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv rsa2pub $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/rsa2ssh.json

@@ -0,0 +1,17 @@
+{
+    "Name": "rsa2ssh",
+    "Program": "rsa2ssh",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "rsa2ssh.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv rsa2ssh $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/rsa2x509.c

@@ -26,8 +26,8 @@ void
 main(int argc, char **argv)
 {
 	int len;
-	uchar *cert;
-	ulong valid[2];
+	unsigned char *cert;
+	uint32_t valid[2];
 	RSApriv *key;
 
 	fmtinstall('B', mpfmt);

sys/src/cmd/auth/rsa2x509.json

@@ -0,0 +1,17 @@
+{
+    "Name": "rsa2x509",
+    "Program": "rsa2x509",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "rsa2x509.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv rsa2x509 $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/rsafill.json

@@ -0,0 +1,17 @@
+{
+    "Name": "rsafill",
+    "Program": "rsafill",
+    "Include": ["../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "rsafill.c",
+    "rsa2any.c"
+	],
+    "Oflags": [
+    "lib/libauthcmd.a"
+    ],
+	"Post": [
+    "mv rsafill $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/secstore/SConn.h

@@ -16,9 +16,9 @@ typedef struct SConn SConn;
 struct SConn {
 	void 	*chan;
 	int 	secretlen;
-	int 	(*secret)(SConn*, uchar*, int);
-	int 	(*read)(SConn*, uchar*, int); /* <0 if error; errmess in buffer */
-	int	(*write)(SConn*, uchar*, int);
+	int 	(*secret)(SConn*, unsigned char*, int);
+	int 	(*read)(SConn*, unsigned char*, int); /* <0 if error; errmess in buffer */
+	int	(*write)(SConn*, unsigned char*, int);
 	void	(*free)(SConn*);	/* also closes file descriptor */
 };
 
@@ -39,6 +39,6 @@ void	writerr(SConn*, char*);
  */
 int	readstr(SConn*, char*);
 
-void	*emalloc(ulong);		/* dies on failure; clears memory */
+void	*emalloc(uint32_t);		/* dies on failure; clears memory */
 void	*erealloc(void*, uint32_t);
 char	*estrdup(char*);

sys/src/cmd/auth/secstore/aescbc.c

@@ -48,8 +48,8 @@ main(int argc, char **argv)
 	int encrypt = 0;  /* 0=decrypt, 1=encrypt */
 	int n, nkey, pass_stdin = 0, pass_nvram = 0;
 	char *pass;
-	uchar key[AESmaxkey], key2[SHA1dlen];
-	uchar buf[BUF+SHA1dlen];    /* assumption: CHK <= SHA1dlen */
+	unsigned char key[AESmaxkey], key2[SHA1dlen];
+	unsigned char buf[BUF+SHA1dlen];    /* assumption: CHK <= SHA1dlen */
 	AESstate aes;
 	DigestState *dstate;
 	Nvrsafe nvr;
@@ -96,7 +96,7 @@ main(int argc, char **argv)
 	}
 	if(n <= 0)
 		sysfatal("no key");
-	dstate = sha1((uchar*)"aescbc file", 11, nil, nil);
+	dstate = sha1((unsigned char*)"aescbc file", 11, nil, nil);
 	sha1(buf, n, key2, dstate);
 	memcpy(key, key2, 16);
 	nkey = 16;

sys/src/cmd/auth/secstore/aescbc.json

@@ -0,0 +1,14 @@
+{
+    "Name": "aescbc",
+    "Program": "aescbc",
+    "Include": ["../../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "aescbc.c",
+    "util.c"
+	],
+	"Post": [
+    "mv aescbc $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/secstore/mkfile

@@ -1,51 +0,0 @@
-</$objtype/mkfile
-BIN=/$objtype/bin/auth
-HFILES =\
-	SConn.h\
-	secstore.h\
-
-OFILES =\
-	pak.$O\
-	password.$O\
-	SConn.$O\
-	util.$O\
-
-
-TARG = secstore secstored secuser aescbc	# descbc
-DEBUG = secchk
-
-UPDATE=\
-	$HFILES\
-	dirls.c\
-	${OFILES:%.$O=%.c}\
-	${TARG:%=%.c}\
-	${DEBUG:%=%.c}\
-	mkfile\
-	/sys/man/1/secstore\
-
-default:V: all
-
-$O.aescbc: aescbc.$O util.$O
-	$LD -o $target $prereq
-$O.descbc: descbc.$O util.$O
-	$LD -o $target $prereq
-
-$O.secstore: secstore.$O  $OFILES
-	$LD -o $target $prereq
-
-$O.secstored: secstored.$O dirls.$O secureidcheck.$O $OFILES
-	$LD -o $target $prereq
-
-$O.secuser: secuser.$O $OFILES
-	$LD -o $target $prereq
-
-secstore.$O secstored.$O $OFILES: $HFILES
-
-secureidcheck.$O: ../secureidcheck.c
-	$CC $CFLAGS ../secureidcheck.c
-
-# debugging
-$O.secchk: secchk.$O secureidcheck.$O
-	$LD -o $target $prereq
-
-</sys/src/cmd/mkmany

sys/src/cmd/auth/secstore/secstore.h

@@ -23,8 +23,8 @@ enum {
 typedef struct PW {
 	char	*id;		/* user id */
 	uint32_t	expire;		/* expiration time (epoch seconds) */
-	ushort	status;		/* Enabled, STA, ... */
-	ushort	failed;		/* number of failed login attempts */
+	uint16_t	status;		/* Enabled, STA, ... */
+	uint16_t	failed;		/* number of failed login attempts */
 	char	*other;		/* other information, e.g. sponsor */
 	mpint	*Hi;  		/* H(passphrase)^-1 mod p */
 } PW;

sys/src/cmd/auth/secstore/secstore.json

@@ -0,0 +1,22 @@
+{
+    "Name": "secstore",
+    "Program": "secstore",
+    "Include": ["../../cmd.json"],
+    "Projects": [
+    "aescbc.json",
+    "secstored.json",
+    "secuser.json"
+    ],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "pak.c",
+    "password.c",
+    "secstore.c",
+    "SConn.c",
+    "util.c"
+	],
+	"Post": [
+    "mv secstore $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/secstore/secstored.json

@@ -0,0 +1,19 @@
+{
+    "Name": "secstored",
+    "Program": "secstored",
+    "Include": ["../../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "dirls.c",
+    "pak.c",
+    "password.c",
+    "SConn.c",
+    "secstored.c",
+    "../secureidcheck.c",
+    "util.c"
+	],
+	"Post": [
+    "mv secstored $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/secstore/secuser.c

@@ -40,7 +40,7 @@ main(int argc, char **argv)
 	int isnew;
 	char *id, buf[Maxmsg], home[Maxmsg], prompt[100], *hexHi;
 	char *pass, *passck;
-	long expsecs;
+	uint32_t expsecs;
 	mpint *H = mpnew(0), *Hi = mpnew(0);
 	PW *pw;
 	Tm *tm;

sys/src/cmd/auth/secstore/secuser.json

@@ -0,0 +1,17 @@
+{
+    "Name": "secuser",
+    "Program": "secuser",
+    "Include": ["../../cmd.json"],
+    "Pre": [
+	],
+    "SourceFiles": [
+    "pak.c",
+    "password.c",
+    "SConn.c",
+    "secuser.c",
+    "util.c"
+	],
+	"Post": [
+    "mv secuser $HARVEY/amd64/bin/auth/"
+	]
+}

sys/src/cmd/auth/secureidcheck.c

@@ -123,7 +123,7 @@ freePacket(Packet *p)
 }
 
 int
-ding(void*, char *msg)
+ding(void *v, char *msg)
 {
 	syslog(0, AUTHLOG, "ding %s", msg);
 	if(strstr(msg, "alarm"))

sys/src/cmd/aux/aux.json

@@ -47,7 +47,7 @@
 	"zerotrunc.c"
 	],
 	"Post": [
-	"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
+	"mkdir -p $HARVEY/amd64/bin/aux",
 	"mv 9pcon $HARVEY/amd64/bin/aux/",
 	"mv accupoint $HARVEY/amd64/bin/aux/",
 	"mv acidleak $HARVEY/amd64/bin/aux/",

sys/src/cmd/cmd.json

@@ -36,7 +36,6 @@
 	"-lmemdraw",
 	"-lmemlayer",
 	"-ldraw",
-	"-lndb",
 	"-lplumb",
 	"-lregexp",
 	"-lstdio",
@@ -45,6 +44,7 @@
 	"-l9p",
 	"-lauth",
 	"-lauthsrv",
+	"-lndb",
 	"-lsec",
 	"-lauth",
 	"-lmp",

sys/src/cmd/cmds.json

@@ -4,6 +4,7 @@
 	"9660srv/9660srv.json",
 	"9nfs/9nfs.json",
 	"astro/astro.json",
+	"auth/auth.json",
 	"aux/aux.json",
 	"bzip2/bzip2.json",
 	"cb/cb.json",

sys/src/libsec/libsec.json

@@ -57,6 +57,7 @@
 	"port/sha2block128.c",
 	"port/sha2block64.c",
 	"port/smallprimes.c",
+	"port/smallprimetest.c",
 	"port/thumb.c",
 	"port/tlshand.c",
 	"port/x509.c"