aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd/auth/factotum/conv.c9
-rw-r--r--src/cmd/auth/factotum/httpdigest.c4
-rw-r--r--src/cmd/auth/factotum/pass.c2
-rw-r--r--src/cmd/auth/factotum/rsa.c4
4 files changed, 8 insertions, 11 deletions
diff --git a/src/cmd/auth/factotum/conv.c b/src/cmd/auth/factotum/conv.c
index 862993f9..a39abff5 100644
--- a/src/cmd/auth/factotum/conv.c
+++ b/src/cmd/auth/factotum/conv.c
@@ -192,12 +192,9 @@ convwrite(Conv *c, void *data, int count)
{
Rpc *r;
- for(;;){
- r = convgetrpc(c, RpcRead);
- if(r == nil)
- return -1;
- break;
- }
+ r = convgetrpc(c, RpcRead);
+ if(r == nil)
+ return -1;
rpcrespondn(c, "ok", data, count);
return 0;
}
diff --git a/src/cmd/auth/factotum/httpdigest.c b/src/cmd/auth/factotum/httpdigest.c
index 70815a56..4f05b6d6 100644
--- a/src/cmd/auth/factotum/httpdigest.c
+++ b/src/cmd/auth/factotum/httpdigest.c
@@ -114,6 +114,6 @@ Proto httpdigest =
"httpdigest",
hdroles,
"user? realm? !password?",
- nil,
- nil
+ 0,
+ 0
};
diff --git a/src/cmd/auth/factotum/pass.c b/src/cmd/auth/factotum/pass.c
index 9c6c7341..453045ce 100644
--- a/src/cmd/auth/factotum/pass.c
+++ b/src/cmd/auth/factotum/pass.c
@@ -37,5 +37,5 @@ Proto pass =
passroles,
"user? !password?",
nil,
- nil,
+ nil
};
diff --git a/src/cmd/auth/factotum/rsa.c b/src/cmd/auth/factotum/rsa.c
index 943ea67b..a865810d 100644
--- a/src/cmd/auth/factotum/rsa.c
+++ b/src/cmd/auth/factotum/rsa.c
@@ -62,7 +62,7 @@ xrsadecrypt(Conv *c)
}
/* encrypt/decrypt */
- m = betomp(txt, n, nil);
+ m = betomp((uchar*)txt, n, nil);
if(m == nil)
goto out;
if(strcmp(role, "decrypt") == 0)
@@ -71,7 +71,7 @@ xrsadecrypt(Conv *c)
mm = rsaencrypt(&key->pub, m, nil);
if(mm == nil)
goto out;
- n = mptobe(mm, buf, sizeof buf, nil);
+ n = mptobe(mm, (uchar*)buf, sizeof buf, nil);
/* send response */
c->state = "write";