From 554fb43df5e3da4051fb7befef51c7b529b55d84 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Sun, 3 Dec 2017 05:14:33 +0100
Subject: [PATCH] libauth: replace proto=p9cr with new proto=dp9ik/p9sk1
 role=login for auth_userpasswd()

---
 sys/src/libauth/auth_userpasswd.c | 59 ++++++++++++-------------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/sys/src/libauth/auth_userpasswd.c b/sys/src/libauth/auth_userpasswd.c
index b5a2c89a9..62ed2c0da 100644
--- a/sys/src/libauth/auth_userpasswd.c
+++ b/sys/src/libauth/auth_userpasswd.c
@@ -1,49 +1,36 @@
 #include <u.h>
 #include <libc.h>
 #include <auth.h>
-#include <authsrv.h>
 #include "authlocal.h"
 
-/*
- * compute the proper response.  We encrypt the ascii of
- * challenge number, with trailing binary zero fill.
- * This process was derived empirically.
- * this was copied from inet's guard.
- */
-static void
-netresp(char key[DESKEYLEN], long chal, char *answer)
-{
-	uchar buf[8];
-
-	memset(buf, 0, sizeof buf);
-	snprint((char *)buf, sizeof buf, "%lud", chal);
-	if(encrypt(key, buf, 8) < 0)
-		abort();
-	sprint(answer, "%.8ux", buf[0]<<24 | buf[1]<<16 | buf[2]<<8 | buf[3]);
-}
-
 AuthInfo*
 auth_userpasswd(char *user, char *passwd)
 {
-	char resp[16], key[DESKEYLEN];
+	AuthRpc *rpc;
 	AuthInfo *ai;
-	Chalstate *ch;
+	char *s;
+	int afd;
 
-	/*
-	 * Probably we should have a factotum protocol
-	 * to check a raw password.  For now, we use
-	 * p9cr, which is simplest to speak.
-	 */
-	if((ch = auth_challenge("user=%q proto=p9cr role=server", user)) == nil)
+	afd = open("/mnt/factotum/rpc", ORDWR);
+	if(afd < 0)
 		return nil;
-
-	passtodeskey(key, passwd);
-	netresp(key, atol(ch->chal), resp);
-	memset(key, 0, sizeof(key));
-
-	ch->resp = resp;
-	ch->nresp = strlen(resp);
-	ai = auth_response(ch);
-	auth_freechal(ch);
+	ai = nil;
+	rpc = auth_allocrpc(afd);
+	if(rpc == nil)
+		goto Out;
+	s = "proto=dp9ik role=login";
+	if(auth_rpc(rpc, "start", s, strlen(s)) != ARok){
+		s = "proto=p9sk1 role=login";
+		if(auth_rpc(rpc, "start", s, strlen(s)) != ARok)
+			goto Out;
+	}
+	if(auth_rpc(rpc, "write", user, strlen(user)) != ARok
+	|| auth_rpc(rpc, "write", passwd, strlen(passwd)) != ARok)
+		goto Out;
+	ai = auth_getinfo(rpc);
+Out:
+	if(rpc != nil)
+		auth_freerpc(rpc);
+	close(afd);
 	return ai;
 }