introduce AES key into nvram and keyfs

2 files changed, 40 insertions, 14 deletions

diff --git a/sys/src/libauthsrv/passtokey.c b/sys/src/libauthsrv/passtokey.c
index 44963cec6..c829b374e 100644
--- a/sys/src/libauthsrv/passtokey.c
+++ b/sys/src/libauthsrv/passtokey.c
@@ -1,9 +1,10 @@
 #include <u.h>
 #include <libc.h>
 #include <authsrv.h>
+#include <libsec.h>
 
-int
-passtokey(Authkey *key, char *p)
+static void
+passtodeskey(char *key, char *p)
 {
 	uchar buf[ANAMELEN], *t;
 	int i, n;
@@ -15,18 +16,33 @@ passtokey(Authkey *key, char *p)
 	t = buf;
 	strncpy((char*)t, p, n);
 	t[n] = 0;
-	memset(key, 0, sizeof(Authkey));
+	memset(key, 0, DESKEYLEN);
 	for(;;){
 		for(i = 0; i < DESKEYLEN; i++)
-			key->des[i] = (t[i] >> i) + (t[i+1] << (8 - (i+1)));
+			key[i] = (t[i] >> i) + (t[i+1] << (8 - (i+1)));
 		if(n <= 8)
-			return 1;
+			return;
 		n -= 8;
 		t += 8;
 		if(n < 8){
 			t -= 8 - n;
 			n = 8;
 		}
-		encrypt(key->des, t, 8);
+		encrypt(key, t, 8);
 	}
 }
+
+static void
+passtoaeskey(uchar *key, char *p)
+{
+	static char salt[] = "Plan 9 key derivation";
+	pbkdf2_hmac_sha1((uchar*)p, strlen(p), (uchar*)salt, sizeof(salt)-1, 9001, key, AESKEYLEN);
+}
+
+void
+passtokey(Authkey *key, char *p)
+{
+	memset(key, 0, sizeof(Authkey));
+	passtodeskey(key->des, p);
+	passtoaeskey(key->aes, p);
+}
diff --git a/sys/src/libauthsrv/readnvram.c b/sys/src/libauthsrv/readnvram.c
index 5d054725d..ae708acbc 100644
--- a/sys/src/libauthsrv/readnvram.c
+++ b/sys/src/libauthsrv/readnvram.c
@@ -268,13 +268,22 @@ readnvram(Nvrsafe *safep, int flag)
 
 			/* verify data read */
 			err |= check(safe->machkey, DESKEYLEN, safe->machsum,
-						"bad nvram key");
-//			err |= check(safe->config, CONFIGLEN, safe->configsum,
-//						"bad secstore key");
+						"bad nvram des key");
 			err |= check(safe->authid, ANAMELEN, safe->authidsum,
 						"bad authentication id");
 			err |= check(safe->authdom, DOMLEN, safe->authdomsum,
 						"bad authentication domain");
+			if(0){
+				err |= check(safe->config, CONFIGLEN, safe->configsum,
+						"bad secstore key");
+				err |= check(safe->aesmachkey, AESKEYLEN, safe->aesmachsum,
+						"bad nvram aes key");
+			} else {
+				if(nvcsum(safe->config, CONFIGLEN) != safe->configsum)
+					memset(safe->config, 0, CONFIGLEN);
+				if(nvcsum(safe->aesmachkey, AESKEYLEN) != safe->aesmachsum)
+					memset(safe->aesmachkey, 0, AESKEYLEN);
+			}
 			if(err == 0)
 				if(safe->authid[0]==0 || safe->authdom[0]==0){
 					fprint(2, "empty nvram authid or authdom\n");
@@ -296,18 +305,19 @@ readnvram(Nvrsafe *safep, int flag)
 
 				if(readcons("password", nil, 1, in, sizeof in) == nil)
 					goto Out;
-				if(passtokey(&k, in)){
-					memmove(safe->machkey, k.des, DESKEYLEN);
-					break;
-				}
+				passtokey(&k, in);
+				memmove(safe->machkey, k.des, DESKEYLEN);
+				memmove(safe->aesmachkey, k.aes, AESKEYLEN);
+				break;
 			}
 		}
 
-		// safe->authsum = nvcsum(safe->authkey, DESKEYLEN);
 		safe->machsum = nvcsum(safe->machkey, DESKEYLEN);
+		// safe->authsum = nvcsum(safe->authkey, DESKEYLEN);
 		safe->configsum = nvcsum(safe->config, CONFIGLEN);
 		safe->authidsum = nvcsum(safe->authid, sizeof safe->authid);
 		safe->authdomsum = nvcsum(safe->authdom, sizeof safe->authdom);
+		safe->aesmachsum = nvcsum(safe->aesmachkey, AESKEYLEN);
 
 		*(Nvrsafe*)buf = *safe;
 		if(loc.fd < 0