xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libauthsrv: ANAMELEN -> PASSWDLEN

Browse source
This commit is contained in:
cinap_lenrek 2016-08-05 19:09:42 +02:00
parent b540a22eb0
commit b21fe017d1
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sys/include/authsrv.h
View file

@ -108,7 +108,7 @@ struct Passwordreq
char changesecret; char changesecret;
char secret[SECRETLEN]; /* new secret */ char secret[SECRETLEN]; /* new secret */
}; };
#define MAXPASSREQLEN (12+2*ANAMELEN+1+SECRETLEN+16) #define MAXPASSREQLEN (12+2*PASSWDLEN+1+SECRETLEN+16)
struct OChapreply struct OChapreply
{ {

12
sys/src/libauthsrv/convM2PR.c
View file

@ -12,13 +12,13 @@ convM2PR(char *ap, int n, Passwordreq *f, Ticket *t)
memset(f, 0, sizeof(Passwordreq)); memset(f, 0, sizeof(Passwordreq));
if(t->form == 0){ if(t->form == 0){
m = 1+2*ANAMELEN+1+SECRETLEN; m = 1+2*PASSWDLEN+1+SECRETLEN;
if(n < m) if(n < m)
return -m; return -m;
memmove(buf, ap, m); memmove(buf, ap, m);
decrypt(t->key, buf, m); decrypt(t->key, buf, m);
} else { } else {
m = 12+2*ANAMELEN+1+SECRETLEN+16; m = 12+2*PASSWDLEN+1+SECRETLEN+16;
if(n < m) if(n < m)
return -m; return -m;
memmove(buf, ap, m); memmove(buf, ap, m);
@ -27,12 +27,12 @@ convM2PR(char *ap, int n, Passwordreq *f, Ticket *t)
} }
p = buf; p = buf;
f->num = *p++; f->num = *p++;
memmove(f->old, p, ANAMELEN), p += ANAMELEN; memmove(f->old, p, PASSWDLEN), p += PASSWDLEN;
memmove(f->new, p, ANAMELEN), p += ANAMELEN; memmove(f->new, p, PASSWDLEN), p += PASSWDLEN;
f->changesecret = *p++; f->changesecret = *p++;
memmove(f->secret, p, SECRETLEN); memmove(f->secret, p, SECRETLEN);
f->old[ANAMELEN-1] = 0; f->old[PASSWDLEN-1] = 0;
f->new[ANAMELEN-1] = 0; f->new[PASSWDLEN-1] = 0;
f->secret[SECRETLEN-1] = 0; f->secret[SECRETLEN-1] = 0;
return m; return m;

8
sys/src/libauthsrv/convPR2M.c
View file

@ -9,13 +9,13 @@ convPR2M(Passwordreq *f, char *ap, int n, Ticket *t)
{ {
uchar *p; uchar *p;
if(n < 1+2*ANAMELEN+1+SECRETLEN) if(n < 1+2*PASSWDLEN+1+SECRETLEN)
return 0; return 0;
p = (uchar*)ap; p = (uchar*)ap;
*p++ = f->num; *p++ = f->num;
memmove(p, f->old, ANAMELEN), p += ANAMELEN; memmove(p, f->old, PASSWDLEN), p += PASSWDLEN;
memmove(p, f->new, ANAMELEN), p += ANAMELEN; memmove(p, f->new, PASSWDLEN), p += PASSWDLEN;
*p++ = f->changesecret; *p++ = f->changesecret;
memmove(p, f->secret, SECRETLEN), p += SECRETLEN; memmove(p, f->secret, SECRETLEN), p += SECRETLEN;
switch(t->form){ switch(t->form){
@ -24,7 +24,7 @@ convPR2M(Passwordreq *f, char *ap, int n, Ticket *t)
encrypt(t->key, ap, n); encrypt(t->key, ap, n);
return n; return n;
case 1: case 1:
if(n < 12+2*ANAMELEN+1+SECRETLEN+16) if(n < 12+2*PASSWDLEN+1+SECRETLEN+16)
return 0; return 0;
return form1B2M(ap, p - (uchar*)ap, t->key); return form1B2M(ap, p - (uchar*)ap, t->key);
} }