1 --- netatalk-1.6.0/bin/afppasswd/afppasswd.c.org Wed Jan 15 11:29:09 2003
2 +++ netatalk-1.6.0/bin/afppasswd/afppasswd.c Wed Jan 15 11:25:54 2003
4 /* decrypt the password */
5 ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT);
7 - memset(schedule, 0, sizeof(schedule));
8 + memset(&schedule, 0, sizeof(schedule));
12 --- netatalk-1.6.0/etc/uams/uams_randnum.c.org Wed Jan 15 12:14:51 2003
13 +++ netatalk-1.6.0/etc/uams/uams_randnum.c Wed Jan 15 12:16:12 2003
15 /* decrypt the password */
16 ecb_encrypt((C_Block *) p, (C_Block *) p, schedule, DES_DECRYPT);
18 - memset(schedule, 0, sizeof(schedule));
19 + memset(&schedule, 0, sizeof(schedule));
24 memset(seskey, 0, sizeof(seskey));
25 ecb_encrypt((C_Block *) randbuf, (C_Block *) randbuf,
26 seskeysched, DES_ENCRYPT);
27 - memset(seskeysched, 0, sizeof(seskeysched));
28 + memset(&seskeysched, 0, sizeof(seskeysched));
30 /* test against what the client sent */
31 if (memcmp( randbuf, ibuf, sizeof(randbuf) )) { /* != */
33 /* test against client's reply */
34 if (memcmp(randbuf, ibuf, sizeof(randbuf))) { /* != */
35 memset(randbuf, 0, sizeof(randbuf));
36 - memset(seskeysched, 0, sizeof(seskeysched));
37 + memset(&seskeysched, 0, sizeof(seskeysched));
38 return AFPERR_NOTAUTH;
40 ibuf += sizeof(randbuf);
42 /* encrypt client's challenge and send back */
43 ecb_encrypt( (C_Block *) ibuf, (C_Block *) rbuf,
44 seskeysched, DES_ENCRYPT);
45 - memset(seskeysched, 0, sizeof(seskeysched));
46 + memset(&seskeysched, 0, sizeof(seskeysched));
47 *rbuflen = sizeof(randbuf);
51 err = randpass(pwd, passwdfile, ibuf + PASSWDLEN, sizeof(seskey), 1);
53 /* zero out some fields */
54 - memset(seskeysched, 0, sizeof(seskeysched));
55 + memset(&seskeysched, 0, sizeof(seskeysched));
56 memset(seskey, 0, sizeof(seskey));
57 memset(ibuf, 0, sizeof(seskey)); /* old passwd */
58 memset(ibuf + PASSWDLEN, 0, sizeof(seskey)); /* new passwd */