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

Introduce and apply krb5_storage_from_socket

Browse Source 
On Windows a file descriptor is an int value allocated by the
local module instance of the C Run Time Library.  A socket handle is a
SOCKET value allocated by a Winsock Provider for the requested family and
protocol.   These two values cannot be mixed and there is no mechanism for
converting between the two.   The _get_osfhandle() and _open_osfhandle()
functions can work with a standard HANDLE (file, pipe, etc) but cannot be
used for a SOCKET.

The Heimdal krb5_storage_from_fd() routine counted on the osf conversion
functions working on SOCKET values.  Since they do not any attempt to call
krb5_storage_from_fd() on a socket resulted in an assertion being thrown
by the C RTL.

Another problem is SOCKET value truncation when storing a 64-bit value
into a 32-bit int.

To address these problems a new krb5_storage_from_socket() routine is
introduced.  This routine setups a krb5_storage that stores a socket value
as a rk_socket_t and provides a set of helper routines that always use
network ready functions.

The krb5_storage_from_fd() routines no longer use net_read() and
net_write() but provide helpers that follow their logic so that pipes can
be processed.

All call sites that allocate a socket now store the socket as rk_socket_t
and call krb5_storage_from_socket().

All locations that previously called the bare close() on a socket value
now call rk_closesocket().

Change-Id: I045f775b2a5dbf5cf803751409490bc27fffe597
This commit is contained in:
Jeffrey Altman
2014-02-04 23:02:01 -05:00
parent fdabfd6040
commit dba026b5ef
13 changed files with 252 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/kadm5/send_recv.c
View File

@@ -43,7 +43,7 @@ _kadm5_client_send(kadm5_client_context *context, krb5_storage *sp)
size_t len;
krb5_storage *sock;
assert(context->sock != -1);
assert(context->sock != rk_INVALID_SOCKET);
len = krb5_storage_seek(sp, 0, SEEK_CUR);
ret = krb5_data_alloc(&msg, len);
@@ -59,7 +59,7 @@ _kadm5_client_send(kadm5_client_context *context, krb5_storage *sp)
if(ret)
return ret;
sock = krb5_storage_from_fd(context->sock);
sock = krb5_storage_from_socket(context->sock);
if(sock == NULL) {
krb5_clear_error_message(context->context);
krb5_data_free(&out);
@@ -81,7 +81,7 @@ _kadm5_client_recv(kadm5_client_context *context, krb5_data *reply)
krb5_data data;
krb5_storage *sock;
sock = krb5_storage_from_fd(context->sock);
sock = krb5_storage_from_socket(context->sock);
if(sock == NULL) {
krb5_clear_error_message(context->context);
return ENOMEM;