tmore bug fixes - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit e1a22963294b001a2a87d53df21ca990f5f7aba6
(DIR) parent 8e4cf69e46dd53a3c63aed3c24c9659472ca363a
(HTM) Author: rsc <devnull@localhost>
Date: Sun, 13 Feb 2005 23:08:55 +0000
more bug fixes
Diffstat:
M src/cmd/auth/factotum/rpc.c | 2 +-
M src/cmd/auth/factotum/rsa.c | 4 ++--
M src/cmd/auth/ssh-agent.c | 33 +++++++++++---------------------
3 files changed, 14 insertions(+), 25 deletions(-)
---
(DIR) diff --git a/src/cmd/auth/factotum/rpc.c b/src/cmd/auth/factotum/rpc.c
t@@ -260,7 +260,7 @@ rpcrespondn(Conv *c, char *verb, void *data, int count)
p = c->reply + strlen(c->reply);
*p++ = ' ';
if(hex){
- enc16(p, 2*count, data, count);
+ enc16(p, 2*count+1, data, count);
p += 2*count;
}else{
memmove(p, data, count);
(DIR) diff --git a/src/cmd/auth/factotum/rsa.c b/src/cmd/auth/factotum/rsa.c
t@@ -66,12 +66,12 @@ xrsadecrypt(Conv *c)
if(m == nil)
goto out;
if(strcmp(role, "decrypt") == 0)
- mm = rsadecrypt(key, m, m);
+ mm = rsadecrypt(key, m, nil);
else
mm = rsaencrypt(&key->pub, m, nil);
if(mm == nil)
goto out;
- n = mptobe(m, buf, sizeof buf, nil);
+ n = mptobe(mm, buf, sizeof buf, nil);
/* send response */
c->state = "write";
(DIR) diff --git a/src/cmd/auth/ssh-agent.c b/src/cmd/auth/ssh-agent.c
t@@ -103,8 +103,11 @@ threadmain(int argc, char **argv)
fmtinstall('B', mpfmt);
fmtinstall('H', encodefmt);
fmtinstall('[', encodefmt);
-
+
ARGBEGIN{
+ case '9':
+ chatty9pclient++;
+ break;
case 'D':
chatty++;
break;
t@@ -138,8 +141,6 @@ threadmain(int argc, char **argv)
if((afd = announce(addr, adir)) < 0)
sysfatal("announce %s: %r", addr);
- proccreate(listenproc, nil, STACK);
-
print("SSH_AUTH_SOCK=%s;\n", sock);
if(export)
print("export SSH_AUTH_SOCK;\n");
t@@ -147,6 +148,8 @@ threadmain(int argc, char **argv)
if(export)
print("export SSH_AGENT_PID;\n");
close(1);
+ rfork(RFNOTEG);
+ proccreate(listenproc, nil, STACK);
threadexits(0);
}
t@@ -655,7 +658,7 @@ listkeys(Msg *m, int version)
nk = 0;
pnk = m->p;
put4(m, 0);
- if((fid = nsopen("factotum", nil, "ctl", OREAD)) == nil){
+ if((fid = nsopen(factotum, nil, "ctl", OREAD)) == nil){
fprint(2, "ssh-agent: open factotum: %r\n");
return -1;
}
t@@ -775,7 +778,6 @@ static int
dorsa(Aconn *a, mpint *mod, mpint *exp, mpint *chal, uchar chalbuf[32])
{
AuthRpc *rpc;
- mpint *m;
char buf[4096], *p;
mpint *decr, *unpad;
t@@ -784,7 +786,7 @@ dorsa(Aconn *a, mpint *mod, mpint *exp, mpint *chal, uchar chalbuf[32])
fprint(2, "ssh-agent: auth_allocrpc: %r\n");
return -1;
}
- snprint(buf, sizeof buf, "proto=rsa service=ssh role=client n=%lB ek=%lB", mod, exp);
+ snprint(buf, sizeof buf, "proto=rsa service=ssh role=decrypt n=%lB ek=%lB", mod, exp);
if(chatty)
fprint(2, "ssh-agent: start %s\n", buf);
if(auth_rpc(rpc, "start", buf, strlen(buf)) != ARok){
t@@ -793,20 +795,6 @@ dorsa(Aconn *a, mpint *mod, mpint *exp, mpint *chal, uchar chalbuf[32])
auth_freerpc(rpc);
return -1;
}
- m = nil;
- if(auth_rpc(rpc, "read", nil, 0) != ARok){
- fprint(2, "ssh-agent: did not find negotiated key\n");
- goto Die;
- }
- if(chatty)
- fprint(2, "read key %s\n", (char*)rpc->arg);
- m = strtomp(rpc->arg, nil, 16, nil);
- if(mpcmp(m, mod) != 0){
- fprint(2, "ssh-agent: found wrong key\n");
- mpfree(m);
- goto Die;
- }
- mpfree(m);
p = mptoa(chal, 16, nil, 0);
if(p == nil){
t@@ -815,13 +803,13 @@ dorsa(Aconn *a, mpint *mod, mpint *exp, mpint *chal, uchar chalbuf[32])
}
if(chatty)
fprint(2, "ssh-agent: challenge %B => %s\n", chal, p);
- if(auth_rpc(rpc, "write", p, strlen(p)) != ARok){
+ if(auth_rpc(rpc, "writehex", p, strlen(p)) != ARok){
fprint(2, "ssh-agent: dorsa: auth 'write': %r\n");
free(p);
goto Die;
}
free(p);
- if(auth_rpc(rpc, "read", nil, 0) != ARok){
+ if(auth_rpc(rpc, "readhex", nil, 0) != ARok){
fprint(2, "ssh-agent: dorsa: auth 'read': %r\n");
goto Die;
}
t@@ -973,6 +961,7 @@ runmsg(Aconn *a)
if(s == nil)
goto Failchal;
md5(sessid, 16, digest, s);
+ print("md5 %.*H %.*H => %.*H\n", 32, chalbuf, 16, sessid, MD5dlen, digest);
newreply(&m, SSH_AGENT_RSA_RESPONSE);
putn(&m, digest, 16);