X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=sys%2Fsrc%2Fcmd%2Fip%2Fimap4d%2Fauth.c;h=b8dcd7581dcb65a3c4bbf09f35df0ce21c4421c8;hb=757354dac6d55d12f28a3a94c601e625cf89c5ac;hp=b087137322f12a422e2d924de38604a58d2481f5;hpb=a9060cc06bee66e12fe16644511f181a4b0cdbd3;p=plan9front.git diff --git a/sys/src/cmd/ip/imap4d/auth.c b/sys/src/cmd/ip/imap4d/auth.c index b08713732..b8dcd7581 100644 --- a/sys/src/cmd/ip/imap4d/auth.c +++ b/sys/src/cmd/ip/imap4d/auth.c @@ -130,17 +130,11 @@ cramauth(void) AuthInfo *ai; Chalstate *cs; char *s, *t; - int n; if((cs = auth_challenge("proto=cram role=server")) == nil) return "couldn't get cram challenge"; - n = cs->nchal; - s = binalloc(&parseBin, n * 2, 0); - n = enc64(s, n * 2, (uchar*)cs->chal, n); - Bprint(&bout, "+ "); - Bwrite(&bout, s, n); - Bprint(&bout, "\r\n"); + Bprint(&bout, "+ %.*[\r\n", cs->nchal, cs->chal); if(Bflush(&bout) < 0) writeErr(); @@ -172,7 +166,6 @@ passLogin(char *user, char *secret) Chalstate *cs; uchar digest[MD5dlen]; char response[2*MD5dlen+1]; - int i; if((cs = auth_challenge("proto=cram role=server")) == nil) return nil; @@ -180,8 +173,7 @@ passLogin(char *user, char *secret) hmac_md5((uchar*)cs->chal, strlen(cs->chal), (uchar*)secret, strlen(secret), digest, nil); - for(i = 0; i < MD5dlen; i++) - snprint(response + 2*i, sizeof(response) - 2*i, "%2.2ux", digest[i]); + snprint(response, sizeof(response), "%.*H", MD5dlen, digest); cs->user = user; cs->resp = response;