diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-20 05:13:04 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-02-20 05:13:04 +0000 |
| commit | aaf680ce594590b037a71021ad1fe7c7e1478de6 (patch) | |
| tree | 39dce0aa9579125e92d2648bd50eee6ebe8619c5 /net/netatalk-devel | |
| parent | be6d48096ac2749d5b9d22ddb75b477f5e99e5b0 (diff) | |
Fix build with OpenSSL 0.9.7.
Reported by: Robin P. Blanchard <Robin.Blanchard@gactr.uga.edu>
Notes
Notes:
svn path=/head/; revision=75927
Diffstat (limited to 'net/netatalk-devel')
| -rw-r--r-- | net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c | 11 | ||||
| -rw-r--r-- | net/netatalk-devel/files/patch-etc_uams_uams_randnum.c | 47 |
2 files changed, 58 insertions, 0 deletions
diff --git a/net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c b/net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c new file mode 100644 index 000000000000..8d5838b9a6a0 --- /dev/null +++ b/net/netatalk-devel/files/patch-bin_afppasswd_afppasswd.c @@ -0,0 +1,11 @@ +--- bin/afppasswd/afppasswd.c.orig Thu Feb 20 00:04:51 2003 ++++ bin/afppasswd/afppasswd.c Thu Feb 20 00:04:57 2003 +@@ -114,7 +114,7 @@ + /* decrypt the password */ + ecb_encrypt((C_Block *) buf, (C_Block *) buf, schedule, DES_DECRYPT); + } +- memset(schedule, 0, sizeof(schedule)); ++ memset(&schedule, 0, sizeof(schedule)); + } + + if (newpwd) { diff --git a/net/netatalk-devel/files/patch-etc_uams_uams_randnum.c b/net/netatalk-devel/files/patch-etc_uams_uams_randnum.c new file mode 100644 index 000000000000..b7c5648127e3 --- /dev/null +++ b/net/netatalk-devel/files/patch-etc_uams_uams_randnum.c @@ -0,0 +1,47 @@ +--- etc/uams/uams_randnum.c.orig Thu Feb 20 00:05:48 2003 ++++ etc/uams/uams_randnum.c Thu Feb 20 00:07:56 2003 +@@ -217,7 +217,7 @@ + /* decrypt the password */ + ecb_encrypt((C_Block *) p, (C_Block *) p, schedule, DES_DECRYPT); + } +- memset(schedule, 0, sizeof(schedule)); ++ memset(&schedule, 0, sizeof(schedule)); + } + + if (set) { +@@ -383,7 +383,7 @@ + memset(seskey, 0, sizeof(seskey)); + ecb_encrypt((C_Block *) randbuf, (C_Block *) randbuf, + seskeysched, DES_ENCRYPT); +- memset(seskeysched, 0, sizeof(seskeysched)); ++ memset(&seskeysched, 0, sizeof(seskeysched)); + + /* test against what the client sent */ + if (memcmp( randbuf, ibuf, sizeof(randbuf) )) { /* != */ +@@ -431,7 +431,7 @@ + /* test against client's reply */ + if (memcmp(randbuf, ibuf, sizeof(randbuf))) { /* != */ + memset(randbuf, 0, sizeof(randbuf)); +- memset(seskeysched, 0, sizeof(seskeysched)); ++ memset(&seskeysched, 0, sizeof(seskeysched)); + return AFPERR_NOTAUTH; + } + ibuf += sizeof(randbuf); +@@ -440,7 +440,7 @@ + /* encrypt client's challenge and send back */ + ecb_encrypt( (C_Block *) ibuf, (C_Block *) rbuf, + seskeysched, DES_ENCRYPT); +- memset(seskeysched, 0, sizeof(seskeysched)); ++ memset(&seskeysched, 0, sizeof(seskeysched)); + *rbuflen = sizeof(randbuf); + + *uam_pwd = randpwd; +@@ -495,7 +495,7 @@ + err = randpass(pwd, passwdfile, ibuf + PASSWDLEN, sizeof(seskey), 1); + + /* zero out some fields */ +- memset(seskeysched, 0, sizeof(seskeysched)); ++ memset(&seskeysched, 0, sizeof(seskeysched)); + memset(seskey, 0, sizeof(seskey)); + memset(ibuf, 0, sizeof(seskey)); /* old passwd */ + memset(ibuf + PASSWDLEN, 0, sizeof(seskey)); /* new passwd */ |