2 files changed, 9 insertions(+), 4 deletions(-)

M port/devsdp.c
M port/proc.c

@@ 328,8 328,8 @@ static Algorithm cipheralg[] =
 static Algorithm authalg[] =
 {
 	"null",			0,	nullauthinit,
-	"seanq_hmac_sha1_96",	16,	shaauthinit,
-	"seanq_hmac_md5_96",	16,	md5authinit,
+	"hmac_sha1_96",	16,	shaauthinit,
+	"hmac_md5_96",	16,	md5authinit,
 	nil,			0,	nil,
 };
 


@@ 993,7 993,7 @@ print("convsetstate %s -> %s\n", convstatename[c->state], convstatename[state]);
 			hnputl(c->out.secret, c->acceptid);
 			hnputl(c->out.secret+4, c->dialid);
 		}
-		setalg(c, "seanq_hmac_md5_96", authalg, &c->auth);
+		setalg(c, "hmac_md5_96", authalg, &c->auth);
 		break;
 	case CLocalClose:
 		assert(c->state == CAccept || c->state == COpen);

@@ 527,7 527,12 @@ tsleep(Rendez *r, int (*fn)(void*), void *arg, int ms)
 	ulong when;
 	Proc *f, **l;
 
-	when = MS2TK(ms)+MACHP(0)->ticks;
+	// avoid overflows at the cost of precision
+	if(ms >= 1000000)
+		when = ms/(1000/HZ);
+	else
+		when = MS2TK(ms);
+	when += MACHP(0)->ticks;
 
 	lock(&talarm);
 	/* take out of list if checkalarm didn't */