plan9-archive/drawterm-android2

Makefile+0−1

@@ -6,7 +6,6 @@ OFILES=\ · 5 unmodified lines
6	main.$O\	6	main.$O\
7	cpu.$O\	7	cpu.$O\
8	aan.$O\	8	aan.$O\
9	readcons.$O\
10	secstore.$O\	9	secstore.$O\
11	latin1.$O\	10	latin1.$O\
12	$(OS)-factotum.$O\	11	$(OS)-factotum.$O\

cpu.c+9−0

@@ -36,6 +36,15 @@ static int p9authtls(int); · 35 unmodified lines
36	char *authserver;	36	char *authserver;
37	char *secstore;	37	char *secstore;
38		38
		39	char*
		40	estrdup(char *s)
		41	{
		42	s = strdup(s);
		43	if(s == nil)
		44	sysfatal("out of memory");
		45	return s;
		46	}
		47
39	static void	48	static void
40	ending(void)	49	ending(void)
41	{	50	{

drawterm.h+0−1

@@ -3,7 +3,6 @@ extern char *secstore; · 2 unmodified lines
3	extern char secstorebuf[65536];	3	extern char secstorebuf[65536];
4	extern char secstorefetch(char addr, char owner, char passwd);	4	extern char secstorefetch(char addr, char owner, char passwd);
5	extern char *authserver;	5	extern char *authserver;
6	extern char readcons(char prompt, char *def, int secret);
7	extern int exportfs(int);	6	extern int exportfs(int);
8	extern char *user;	7	extern char *user;
9	extern int dialfactotum(void);	8	extern int dialfactotum(void);

include/authsrv.h+4−2

 	NETCHLEN=	16,	/* max network challenge length (used in AS protocol) */
 	CONFIGLEN=	14,
 	SECRETLEN=	32,	/* secret max size */
+	PASSWDLEN=	28,	/* password max size */
 	NONCELEN=	32,
 struct Passwordreq
 {
 	char	num;
-	char	old[ANAMELEN];
+	char	old[PASSWDLEN];
-	char	new[ANAMELEN];
+	char	new[PASSWDLEN];
 	char	changesecret;
 	char	secret[SECRETLEN];	/* new secret */
 };
 extern	uchar	nvcsum(void*, int);
 extern	int	readnvram(Nvrsafe*, int);
+extern	char*	readcons(char*, char*, int);
 /*
  *  call up auth server

kern/devcons.c+3−3

@@ -487,7 +487,7 @@ consclose(Chan *c) · 486 unmodified lines
487	}	487	}
488		488
489	static int	489	static int
490	readcons(Queue q, char buf, int n)	490	qreadcons(Queue q, char buf, int n)
491	{	491	{
492	if(screenputs==0 && !qcanread(q))	492	if(screenputs==0 && !qcanread(q))
493	return read(0, buf, n);	493	return read(0, buf, n);
@@ -521,7 +521,7 @@ consread(Chan c, void buf, long n, vlong off) · 27 unmodified lines
521	else {	521	else {
522	/* read as much as possible */	522	/* read as much as possible */
523	do {	523	do {
524	i = readcons(kbdq, cbuf, n);	524	i = qreadcons(kbdq, cbuf, n);
525	cbuf += i;	525	cbuf += i;
526	n -= i;	526	n -= i;
527	} while (n>0 && qcanread(kbdq));	527	} while (n>0 && qcanread(kbdq));
@@ -530,7 +530,7 @@ consread(Chan c, void buf, long n, vlong off) · 2 unmodified lines
530	} else {	530	} else {
531	while(!qcanread(lineq)) {	531	while(!qcanread(lineq)) {
532	eol = 1;	532	eol = 1;
533	if(readcons(kbdq, &kbd.line[kbd.x], 1) == 1){	533	if(qreadcons(kbdq, &kbd.line[kbd.x], 1) == 1){
534	eol = 0;	534	eol = 0;
535	ch = kbd.line[kbd.x];	535	ch = kbd.line[kbd.x];
536	switch(ch){	536	switch(ch){

libauthsrv/Makefile+1−0

@@ -15,6 +15,7 @@ OFILES=\ · 14 unmodified lines
15	convTR2M.$O\	15	convTR2M.$O\
16	nvcsum.$O\	16	nvcsum.$O\
17	passtokey.$O\	17	passtokey.$O\
		18	readcons.$O\
18	_asgetpakkey.$O\	19	_asgetpakkey.$O\
19	_asgetresp.$O\	20	_asgetresp.$O\
20	_asrequest.$O\	21	_asrequest.$O\

libauthsrv/authdial.c+2−3

 	if(dom == nil)
 		/* look for one relative to my machine */
-		return dial(netmkaddr("$auth", netroot, "ticket"), 0, 0, 0);
+		return dial(netmkaddr("$auth", nil, "ticket"), nil, nil, nil);
 	/* look up an auth server in an authentication domain */
 	p = csgetvalue(netroot, "authdom", dom, "auth", &t);
 	rv = -1;
 	for(nt = t; nt != nil; nt = nt->entry) {
 		if(strcmp(nt->attr, "auth") == 0) {
-			p = netmkaddr(nt->val, netroot, "ticket");
+			rv = dial(netmkaddr(nt->val, nil, "ticket"), nil, nil, nil);
-			rv = dial(p, 0, 0, 0);
 			if(rv >= 0)
 				break;
 		}

libauthsrv/readcons.c+82−0

@@ -0,0 +1,82 @@
	1	#include <u.h>
	2	#include <libc.h>
	3
	4	/*
	5	* prompt for a string with a possible default response
	6	*/
	7	char*
	8	readcons(char prompt, char def, int raw)
	9	{
	10	int fdin, fdout, ctl, n;
	11	char s, p;
	12
	13	s = p = nil;
	14	fdout = ctl = -1;
	15
	16	if((fdin = open("/dev/cons", OREAD)) < 0)
	17	goto Out;
	18	if((fdout = open("/dev/cons", OWRITE)) < 0)
	19	goto Out;
	20
	21	if(raw){
	22	if((ctl = open("/dev/consctl", OWRITE)) < 0)
	23	goto Out;
	24	write(ctl, "rawon", 5);
	25	}
	26
	27	if(def != nil)
	28	fprint(fdout, "%s[%s]: ", prompt, def);
	29	else
	30	fprint(fdout, "%s: ", prompt);
	31
	32	for(;;){
	33	n = p - s;
	34	if((n % 32) == 0){
	35	if((p = realloc(s, n+32)) == nil)
	36	break;
	37	s = p, p += n;
	38	}
	39
	40	if(read(fdin, p, 1) <= 0 \|\| *p == 0x7f)
	41	break;
	42
	43	if(p == '\n' \|\| p == '\r'){
	44	if(p == s && def != nil){
	45	free(s);
	46	s = strdup(def);
	47	} else
	48	*p = 0;
	49	if(raw)
	50	write(fdout, "\n", 1);
	51	goto Out;
	52	} else if(*p == '\b') {
	53	while(p > s && (p[-1] & 0xc0) == 0x80)
	54	*p-- = 0;
	55	if(p > s)
	56	*p-- = 0;
	57	} else if(p == 0x15) { / ^U: line kill */
	58	if(def != nil)
	59	fprint(fdout, "\n%s[%s]: ", prompt, def);
	60	else
	61	fprint(fdout, "\n%s: ", prompt);
	62	while(p > s)
	63	*p-- = 0;
	64	} else if(*p >= ' ')
	65	p++;
	66	}
	67	free(s);
	68	s = nil;
	69	if(raw)
	70	write(fdout, "\n", 1);
	71	Out:
	72	if(ctl >= 0){
	73	write(ctl, "rawoff", 6);
	74	close(ctl);
	75	}
	76	if(fdin >= 0)
	77	close(fdin);
	78	if(fdout >= 0)
	79	close(fdout);
	80
	81	return s;
	82	}

libauthsrv/readnvram.c+39−88

@@ -53,78 +53,6 @@ static struct { · 52 unmodified lines
53	"debug", "/tmp/nvram", 0, sizeof(Nvrsafe),	53	"debug", "/tmp/nvram", 0, sizeof(Nvrsafe),
54	};	54	};
55		55
56	static char*
57	readcons(char prompt, char def, int raw, char *buf, int nbuf)
58	{
59	int fdin, fdout, ctl, n, m;
60	char line[10];
61
62	fdin = open("/dev/cons", OREAD);
63	if(fdin < 0)
64	fdin = 0;
65	fdout = open("/dev/cons", OWRITE);
66	if(fdout < 0)
67	fdout = 1;
68	if(def != nil)
69	fprint(fdout, "%s[%s]: ", prompt, def);
70	else
71	fprint(fdout, "%s: ", prompt);
72	if(raw){
73	ctl = open("/dev/consctl", OWRITE);
74	if(ctl >= 0)
75	write(ctl, "rawon", 5);
76	} else
77	ctl = -1;
78
79	m = 0;
80	for(;;){
81	n = read(fdin, line, 1);
82	if(n == 0){
83	close(ctl);
84	werrstr("readcons: EOF");
85	return nil;
86	}
87	if(n < 0){
88	close(ctl);
89	werrstr("can't read cons");
90	return nil;
91	}
92	if(line[0] == 0x7f)
93	exits(0);
94	if(n == 0 \|\| line[0] == '\n' \|\| line[0] == '\r'){
95	if(raw){
96	write(ctl, "rawoff", 6);
97	write(fdout, "\n", 1);
98	close(ctl);
99	}
100	buf[m] = '\0';
101	if(buf[0]=='\0' && def)
102	strcpy(buf, def);
103	return buf;
104	}
105	if(line[0] == '\b'){
106	if(m > 0)
107	m--;
108	}else if(line[0] == 0x15){ /* ^U: line kill */
109	m = 0;
110	if(def != nil)
111	fprint(fdout, "%s[%s]: ", prompt, def);
112	else
113	fprint(fdout, "%s: ", prompt);
114	}else{
115	if(m >= nbuf-1){
116	fprint(fdout, "line too long\n");
117	m = 0;
118	if(def != nil)
119	fprint(fdout, "%s[%s]: ", prompt, def);
120	else
121	fprint(fdout, "%s: ", prompt);
122	}else
123	buf[m++] = line[0];
124	}
125	}
126	}
127
128	typedef struct {	56	typedef struct {
129	int fd;	57	int fd;
130	int safelen;	58	int safelen;
@@ -211,6 +139,29 @@ findnvram(Nvrwhere *locp) · 80 unmodified lines
211	locp->safeoff = safeoff;	139	locp->safeoff = safeoff;
212	}	140	}
213		141
		142	static int
		143	ask(char prompt, char buf, int len, int raw)
		144	{
		145	char *s;
		146	int n;
		147
		148	memset(buf, 0, len);
		149	for(;;){
		150	if((s = readcons(prompt, nil, raw)) == nil)
		151	return -1;
		152	if((n = strlen(s)) >= len)
		153	fprint(2, "%s longer than %d characters; try again\n", prompt, len-1);
		154	else {
		155	memmove(buf, s, n);
		156	memset(s, 0, n);
		157	free(s);
		158	return 0;
		159	}
		160	memset(s, 0, n);
		161	free(s);
		162	}
		163	}
		164
214	/*	165	/*
215	* get key info out of nvram. since there isn't room in the PC's nvram use	166	* get key info out of nvram. since there isn't room in the PC's nvram use
216	* a disk partition there.	167	* a disk partition there.
@@ -219,7 +170,7 @@ int · 2 unmodified lines
219	readnvram(Nvrsafe *safep, int flag)	170	readnvram(Nvrsafe *safep, int flag)
220	{	171	{
221	int err;	172	int err;
222	char buf[512], in[128]; /* 512 for floppy i/o */	173	char buf[512]; /* 512 for floppy i/o */
223	Nvrsafe *safe;	174	Nvrsafe *safe;
224	Nvrwhere loc;	175	Nvrwhere loc;
225		176
@@ -294,22 +245,22 @@ readnvram(Nvrsafe *safep, int flag) · 68 unmodified lines
294		245
295	if((flag&(NVwrite\|NVwritemem)) \|\| (err && (flag&NVwriteonerr))){	246	if((flag&(NVwrite\|NVwritemem)) \|\| (err && (flag&NVwriteonerr))){
296	if (!(flag&NVwritemem)) {	247	if (!(flag&NVwritemem)) {
297	readcons("authid", nil, 0, safe->authid,	248	char pass[PASSWDLEN];
298	sizeof safe->authid);	249	Authkey k;
299	readcons("authdom", nil, 0, safe->authdom,
300	sizeof safe->authdom);
301	readcons("secstore key", nil, 1, safe->config,
302	sizeof safe->config);
303	for(;;){
304	Authkey k;
305		250
306	if(readcons("password", nil, 1, in, sizeof in) == nil)	251	if(ask("authid", safe->authid, sizeof safe->authid, 0))
307	goto Out;	252	goto Out;
308	passtokey(&k, in);	253	if(ask("authdom", safe->authdom, sizeof safe->authdom, 0))
309	memmove(safe->machkey, k.des, DESKEYLEN);	254	goto Out;
310	memmove(safe->aesmachkey, k.aes, AESKEYLEN);	255	if(ask("secstore key", safe->config, sizeof safe->config, 1))
311	break;	256	goto Out;
312	}	257	if(ask("password", pass, sizeof pass, 1))
		258	goto Out;
		259	passtokey(&k, pass);
		260	memset(pass, 0, sizeof pass);
		261	memmove(safe->machkey, k.des, DESKEYLEN);
		262	memmove(safe->aesmachkey, k.aes, AESKEYLEN);
		263	memset(&k, 0, sizeof k);
313	}	264	}
314		265
315	safe->machsum = nvcsum(safe->machkey, DESKEYLEN);	266	safe->machsum = nvcsum(safe->machkey, DESKEYLEN);

readcons.c+0−110

@@ -1,110 +0,0 @@
1	#include <u.h>
2	#include <libc.h>
3	#include "drawterm.h"
4
5	void*
6	erealloc(void *v, ulong n)
7	{
8	v = realloc(v, n);
9	if(v == nil && n != 0)
10	sysfatal("out of memory");
11	return v;
12	}
13
14	char*
15	estrdup(char *s)
16	{
17	s = strdup(s);
18	if(s == nil)
19	sysfatal("out of memory");
20	return s;
21	}
22
23	char*
24	estrappend(char s, char fmt, ...)
25	{
26	char *t;
27	va_list arg;
28
29	va_start(arg, fmt);
30	t = vsmprint(fmt, arg);
31	if(t == nil)
32	sysfatal("out of memory");
33	va_end(arg);
34	s = erealloc(s, strlen(s)+strlen(t)+1);
35	strcat(s, t);
36	free(t);
37	return s;
38	}
39
40	/*
41	* prompt for a string with a possible default response
42	*/
43	char*
44	readcons(char prompt, char def, int raw)
45	{
46	int fdin, fdout, ctl, n;
47	char line[10];
48	char *s;
49
50	fdin = open("/dev/cons", OREAD);
51	if(fdin < 0)
52	fdin = 0;
53	fdout = open("/dev/cons", OWRITE);
54	if(fdout < 0)
55	fdout = 1;
56	if(def != nil)
57	fprint(fdout, "%s[%s]: ", prompt, def);
58	else
59	fprint(fdout, "%s: ", prompt);
60	if(raw){
61	ctl = open("/dev/consctl", OWRITE);
62	if(ctl >= 0)
63	write(ctl, "rawon", 5);
64	} else
65	ctl = -1;
66	s = estrdup("");
67	for(;;){
68	n = read(fdin, line, 1);
69	if(n == 0){
70	Error:
71	close(fdin);
72	close(fdout);
73	if(ctl >= 0)
74	close(ctl);
75	free(s);
76	return nil;
77	}
78	if(n < 0)
79	goto Error;
80	if(line[0] == 0x7f)
81	goto Error;
82	if(n == 0 \|\| line[0] == '\n' \|\| line[0] == '\r'){
83	if(raw){
84	write(ctl, "rawoff", 6);
85	write(fdout, "\n", 1);
86	}
87	close(ctl);
88	close(fdin);
89	close(fdout);
90	if(*s == 0 && def != nil)
91	s = estrappend(s, "%s", def);
92	return s;
93	}
94	if(line[0] == '\b'){
95	if(strlen(s) > 0)
96	s[strlen(s)-1] = 0;
97	} else if(line[0] == 0x15) { /* ^U: line kill */
98	if(def != nil)
99	fprint(fdout, "\n%s[%s]: ", prompt, def);
100	else
101	fprint(fdout, "\n%s: ", prompt);
102
103	s[0] = 0;
104	} else {
105	s = estrappend(s, "%c", line[0]);
106	}
107	}
108	return nil; /* not reached */
109	}
110

secstore.c+2−1

 #include <libc.h>
 #include <mp.h>
 #include <libsec.h>
+#include <authsrv.h>
 #include "drawterm.h"
 static void*
 	sha1(secret, SHA1dlen, nil, &sha);
 	sha1(data, len, nil, &sha);
 	sha1(seq, 4, digest, &sha);
-	return memcmp(d, digest, SHA1dlen);
+	return tsmemcmp(d, digest, SHA1dlen);
 }
 static int