Browse Source

Plan 9 from Bell Labs 2004-12-25

David du Colombier 16 years ago
parent
commit
1701f0a09b

+ 10 - 7
dist/replica/_plan9.db

@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1102171656 101029
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1103607303 313832
+386/bin/auth/factotum - 775 sys sys 1103861395 313899
 386/bin/auth/fgui - 775 sys sys 1102171657 217758
 386/bin/auth/guard.srv - 775 sys sys 1102171658 142815
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -6919,18 +6919,18 @@ sys/src/cmd/auth/rsagen.c - 664 sys sys 1048614963 992
 sys/src/cmd/auth/secstore - 20000000775 sys sys 1017337838 0
 sys/src/cmd/auth/secstore/SConn.c - 664 sys sys 1064789003 4419
 sys/src/cmd/auth/secstore/SConn.h - 664 sys sys 1015008431 955
-sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1101135279 4332
+sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1103929625 4334
 sys/src/cmd/auth/secstore/dirls.c - 664 sys sys 1062277640 1842
 sys/src/cmd/auth/secstore/mkfile - 664 sys sys 1048615193 844
 sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1101135278 9290
 sys/src/cmd/auth/secstore/password.c - 664 sys sys 1062277640 2770
 sys/src/cmd/auth/secstore/secacct.c - 644 sys sys 1015008431 755
 sys/src/cmd/auth/secstore/secchk.c - 664 sys sys 1055698993 560
-sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1101135279 12528
-sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1101135279 829
+sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1103929625 12531
+sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1103929624 830
 sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1089058000 8328
-sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1101135279 5122
-sys/src/cmd/auth/secstore/util.c - 664 sys sys 1101135279 1477
+sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1103929625 5128
+sys/src/cmd/auth/secstore/util.c - 664 sys sys 1103929624 1478
 sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1078840013 9007
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
 sys/src/cmd/auth/uniq.c - 664 sys sys 1015008430 1429
@@ -12449,4 +12449,7 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/auth/factotum - 775 sys sys 1103861395 313899
+386/bin/auth/aescbc - 775 sys sys 1103947526 133193
+386/bin/auth/secstore - 775 sys sys 1103947527 189196
+386/bin/auth/secstored - 775 sys sys 1103947527 196591
+386/bin/auth/secuser - 775 sys sys 1103947528 152264

+ 9 - 9
dist/replica/plan9.db

@@ -43,7 +43,7 @@
 386/bin/ascii - 775 sys sys 1102171653 64633
 386/bin/astro - 775 sys sys 1085076975 138775
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1102171653 133192
+386/bin/auth/aescbc - 775 sys sys 1103947526 133193
 386/bin/auth/asn12rsa - 775 sys sys 1102171653 119609
 386/bin/auth/authsrv - 775 sys sys 1102171654 165428
 386/bin/auth/changeuser - 775 sys sys 1102171654 96991
@@ -71,9 +71,9 @@
 386/bin/auth/rsafill - 775 sys sys 1102171661 143381
 386/bin/auth/rsagen - 775 sys sys 1102171662 153006
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1102171662 189195
-386/bin/auth/secstored - 775 sys sys 1102171663 196590
-386/bin/auth/secuser - 775 sys sys 1102171663 152255
+386/bin/auth/secstore - 775 sys sys 1103947527 189196
+386/bin/auth/secstored - 775 sys sys 1103947527 196591
+386/bin/auth/secuser - 775 sys sys 1103947528 152264
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1102171663 63017
 386/bin/auth/warning - 775 sys sys 1102171664 99524
@@ -6919,18 +6919,18 @@ sys/src/cmd/auth/rsagen.c - 664 sys sys 1048614963 992
 sys/src/cmd/auth/secstore - 20000000775 sys sys 1017337838 0
 sys/src/cmd/auth/secstore/SConn.c - 664 sys sys 1064789003 4419
 sys/src/cmd/auth/secstore/SConn.h - 664 sys sys 1015008431 955
-sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1101135279 4332
+sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1103929625 4334
 sys/src/cmd/auth/secstore/dirls.c - 664 sys sys 1062277640 1842
 sys/src/cmd/auth/secstore/mkfile - 664 sys sys 1048615193 844
 sys/src/cmd/auth/secstore/pak.c - 664 sys sys 1101135278 9290
 sys/src/cmd/auth/secstore/password.c - 664 sys sys 1062277640 2770
 sys/src/cmd/auth/secstore/secacct.c - 644 sys sys 1015008431 755
 sys/src/cmd/auth/secstore/secchk.c - 664 sys sys 1055698993 560
-sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1101135279 12528
-sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1101135279 829
+sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1103929625 12531
+sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1103929624 830
 sys/src/cmd/auth/secstore/secstored.c - 664 sys sys 1089058000 8328
-sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1101135279 5122
-sys/src/cmd/auth/secstore/util.c - 664 sys sys 1101135279 1477
+sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1103929625 5128
+sys/src/cmd/auth/secstore/util.c - 664 sys sys 1103929624 1478
 sys/src/cmd/auth/secureidcheck.c - 664 sys sys 1078840013 9007
 sys/src/cmd/auth/status - 775 sys sys 1015008430 738
 sys/src/cmd/auth/uniq.c - 664 sys sys 1015008430 1429

+ 9 - 0
dist/replica/plan9.log

@@ -17759,3 +17759,12 @@
 1103794299 53 a sys/src/games/music/readcd - 775 sys sys 1103793915 996
 1103819503 0 c sys/src/cmd/auth/factotum/chap.c - 664 sys sys 1103818824 8942
 1103862710 0 c 386/bin/auth/factotum - 775 sys sys 1103861395 313899
+1103931004 0 c sys/src/cmd/auth/secstore/aescbc.c - 664 sys sys 1103929625 4334
+1103931004 1 c sys/src/cmd/auth/secstore/secstore.c - 664 sys sys 1103929625 12531
+1103931004 2 c sys/src/cmd/auth/secstore/secstore.h - 664 sys sys 1103929624 830
+1103931004 3 c sys/src/cmd/auth/secstore/secuser.c - 664 sys sys 1103929625 5128
+1103931004 4 c sys/src/cmd/auth/secstore/util.c - 664 sys sys 1103929624 1478
+1103949008 0 c 386/bin/auth/aescbc - 775 sys sys 1103947526 133193
+1103949008 1 c 386/bin/auth/secstore - 775 sys sys 1103947527 189196
+1103949008 2 c 386/bin/auth/secstored - 775 sys sys 1103947527 196591
+1103949008 3 c 386/bin/auth/secuser - 775 sys sys 1103947528 152264

+ 2 - 2
sys/src/cmd/auth/secstore/aescbc.c

@@ -11,7 +11,7 @@
 #include <libsec.h>
 #include <authsrv.h>
 
-extern char* getpass(char*);
+extern char* getpassm(char*);
 
 enum{ CHK = 16, BUF = 4096 };
 
@@ -85,7 +85,7 @@ main(int argc, char **argv)
 		strecpy((char*)buf, (char*)buf+sizeof buf, (char*)nvr.config);
 		n = strlen((char*)buf);
 	}else{
-		pass = getpass("aescbc key:");
+		pass = getpassm("aescbc key:");
 		n = strlen(pass);
 		if(n >= BUF)
 			exits("key too long");

+ 5 - 5
sys/src/cmd/auth/secstore/secstore.c

@@ -311,7 +311,7 @@ chpasswd(AuthConn *c, char *id)
 	// changing our password is vulnerable to connection failure
 	for(;;){
 		snprint(prompt, sizeof(prompt), "new password for %s: ", id);
-		newpass = getpass(prompt);
+		newpass = getpassm(prompt);
 		if(newpass == nil)
 			goto Out;
 		if(strlen(newpass) >= 7)
@@ -324,9 +324,9 @@ chpasswd(AuthConn *c, char *id)
 	}
 	newpasslen = strlen(newpass);
 	snprint(prompt, sizeof(prompt), "retype password: ");
-	passck = getpass(prompt);
+	passck = getpassm(prompt);
 	if(passck == nil){
-		fprint(2, "getpasswd failed\n");
+		fprint(2, "getpassm failed\n");
 		goto Out;
 	}
 	if(strcmp(passck, newpass) != 0){
@@ -419,7 +419,7 @@ login(char *id, char *dest, int pass_stdin, int pass_nvram)
 		}
 		ntry++;
 		if(!pass_stdin && !pass_nvram){
-			pass = getpass("secstore password: ");
+			pass = getpassm("secstore password: ");
 			if(strlen(pass) >= sizeof c->pass){
 				fprint(2, "password too long, skipping secstore login\n");
 				exits("password too long");
@@ -460,7 +460,7 @@ login(char *id, char *dest, int pass_stdin, int pass_nvram)
 				exits("missing PIN+SecureID on standard input");
 			free(PINSTA);
 		}else{
-			pass = getpass("STA PIN+SecureID: ");
+			pass = getpassm("STA PIN+SecureID: ");
 			strncpy(s+3, pass, (sizeof s)-4);
 			memset(pass, 0, strlen(pass));
 			free(pass);

+ 1 - 1
sys/src/cmd/auth/secstore/secstore.h

@@ -17,7 +17,7 @@ typedef struct PW {
 PW *getPW(char *, int);
 int putPW(PW *);
 void freePW(PW *);
-char* getpass(char*);
+char* getpassm(char*);
 
 // *client: SConn, client name, passphrase
 // *server: SConn, (partial) 1st msg, PW entry

+ 6 - 6
sys/src/cmd/auth/secstore/secuser.c

@@ -77,10 +77,10 @@ main(int argc, char **argv)
 			snprint(prompt, sizeof(prompt), "%s password: ", id);
 		else
 			snprint(prompt, sizeof(prompt), "%s password [default = don't change]: ", id);
-		pass = getpass(prompt);
+		pass = getpassm(prompt);
 		if(pass == nil){
-			print("getpass failed\n");
-			exits("getpass failed");
+			print("getpassm failed\n");
+			exits("getpassm failed");
 		}
 		if(verbose)
 			print("%ld characters\n", strlen(pass));
@@ -95,10 +95,10 @@ main(int argc, char **argv)
 		snprint(prompt, sizeof(prompt), "retype password: ");
 		if(verbose)
 			print("confirming...\n");
-		passck = getpass(prompt);
+		passck = getpassm(prompt);
 		if(passck == nil){
-			print("getpass failed\n");
-			exits("getpass failed");
+			print("getpassm failed\n");
+			exits("getpassm failed");
 		}
 		if(strcmp(pass, passck) != 0){
 			print("passwords didn't match\n");

+ 1 - 1
sys/src/cmd/auth/secstore/util.c

@@ -28,7 +28,7 @@ estrdup(char *s)
 }
 
 char*
-getpass(char *prompt)
+getpassm(char *prompt)
 {
 	char *p, line[4096];
 	int n, nr;