oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb4_auth, krb4_adat): minor fixes

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5139 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-08-31 19:37:19 +00:00
parent 5de8897961
commit b8a2ca1420
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
appl/ftp/ftp/krb4.c
View File

@@ -121,9 +121,8 @@ krb4_adat(void *app_data, void *buf, size_t len)
int kerror; int kerror;
u_int32_t cs; u_int32_t cs;
char msg[35]; /* size of encrypted block */ char msg[35]; /* size of encrypted block */
int tmp_len;
struct krb4_data *d = app_data; struct krb4_data *d = app_data;
char inst[INST_SZ]; char inst[INST_SZ];
memcpy(tkt.dat, buf, len); memcpy(tkt.dat, buf, len);
@@ -154,12 +153,13 @@ krb4_adat(void *app_data, void *buf, size_t len)
{ {
unsigned char tmp[4]; unsigned char tmp[4];
krb_put_int(cs, tmp, 4, sizeof(tmp)); krb_put_int(cs, tmp, 4, sizeof(tmp));
len = krb_mk_safe(tmp, msg, 4, &d->key, &LOCAL_ADDR, &REMOTE_ADDR); tmp_len = krb_mk_safe(tmp, msg, 4, &d->key, &LOCAL_ADDR, &REMOTE_ADDR);
} }
if(len < 0){ if(tmp_len < 0){
reply(535, "Error creating reply: %s.", strerror(errno)); reply(535, "Error creating reply: %s.", strerror(errno));
return -1; return -1;
} }
len = tmp_len;
if(base64_encode(msg, len, &p) < 0) { if(base64_encode(msg, len, &p) < 0) {
reply(535, "Out of memory base64-encoding."); reply(535, "Out of memory base64-encoding.");
return -1; return -1;
@@ -257,12 +257,13 @@ krb4_auth(void *app_data, char *host)
printf("Remote host didn't send adat reply.\n"); printf("Remote host didn't send adat reply.\n");
return -1; return -1;
} }
p+=5; p += 5;
adat.length = base64_decode(p, adat.dat); len = base64_decode(p, adat.dat);
if(len < 0){ if(len < 0){
printf("Failed to decode base64 from server.\n"); printf("Failed to decode base64 from server.\n");
return -1; return -1;
} }
adat.length = len;
ret = krb_rd_safe(adat.dat, adat.length, &d->key, ret = krb_rd_safe(adat.dat, adat.length, &d->key,
&hisctladdr, &myctladdr, &msg_data); &hisctladdr, &myctladdr, &msg_data);
if(ret){ if(ret){