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

(do_read): use krb5_get_wrapped_length

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5906 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-04-10 15:10:52 +00:00
parent 2fefcb8897
commit 68ac88a65d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
appl/rsh/common.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 1999 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -61,16 +61,13 @@ do_read (int fd,
if (ret != 4) if (ret != 4)
return ret; return ret;
len = ntohl(len); len = ntohl(len);
outer_len = len + 12; outer_len = krb5_get_wrapped_length (context, crypto, len);
outer_len = (outer_len + 7) & ~7;
if (outer_len > sz) if (outer_len > sz)
abort (); abort ();
ret = krb5_net_read (context, &fd, buf, outer_len); ret = krb5_net_read (context, &fd, buf, outer_len);
if (ret != outer_len) if (ret != outer_len)
return ret; return ret;
status = krb5_decrypt(context, crypto, KRB5_KU_OTHER_ENCRYPTED, status = krb5_decrypt(context, crypto, KRB5_KU_OTHER_ENCRYPTED,
buf, outer_len, &data); buf, outer_len, &data);
@@ -106,6 +103,10 @@ do_write (int fd, void *buf, size_t sz)
if (status) if (status)
errx (1, "%s", krb5_get_err_text(context, status)); errx (1, "%s", krb5_get_err_text(context, status));
assert (krb5_get_wrapped_length (context, crypto,
sz) == data.length);
len = htonl(sz); len = htonl(sz);
ret = krb5_net_write (context, &fd, &len, 4); ret = krb5_net_write (context, &fd, &len, 4);
if (ret != 4) if (ret != 4)