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

(gss_import_sec_context): add error checking, pick up lifetime (if

Browse Source 
there is no lifetime, use GSS_C_INDEFINITE)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11767 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-03-16 18:01:32 +00:00
parent 67c9487313
commit dbb7e9163e
2 changed files with 144 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
lib/gssapi/import_sec_context.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1999 - 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -57,6 +57,8 @@ gss_import_sec_context (
GSSAPI_KRB5_INIT (); GSSAPI_KRB5_INIT ();
localp = remotep = NULL;
sp = krb5_storage_from_mem (interprocess_token->value, sp = krb5_storage_from_mem (interprocess_token->value,
interprocess_token->length); interprocess_token->length);
if (sp == NULL) { if (sp == NULL) {
@@ -83,99 +85,113 @@ gss_import_sec_context (
/* flags */ /* flags */
krb5_ret_int32 (sp, &flags); *minor_status = 0;
if (krb5_ret_int32 (sp, &flags) != 0)
goto failure;
/* retrieve the auth context */ /* retrieve the auth context */
ac = (*context_handle)->auth_context; ac = (*context_handle)->auth_context;
krb5_ret_int32 (sp, &ac->flags); krb5_ret_int32 (sp, &ac->flags);
if (flags & SC_LOCAL_ADDRESS) if (flags & SC_LOCAL_ADDRESS) {
krb5_ret_address (sp, localp = &local); if (krb5_ret_address (sp, localp = &local) != 0)
else goto failure;
localp = NULL; }
if (flags & SC_REMOTE_ADDRESS)
krb5_ret_address (sp, remotep = &remote); if (flags & SC_REMOTE_ADDRESS) {
else if (krb5_ret_address (sp, remotep = &remote) != 0)
remotep = NULL; goto failure;
}
krb5_auth_con_setaddrs (gssapi_krb5_context, ac, localp, remotep); krb5_auth_con_setaddrs (gssapi_krb5_context, ac, localp, remotep);
if (localp) if (localp)
krb5_free_address (gssapi_krb5_context, localp); krb5_free_address (gssapi_krb5_context, localp);
if (remotep) if (remotep)
krb5_free_address (gssapi_krb5_context, remotep); krb5_free_address (gssapi_krb5_context, remotep);
krb5_ret_int16 (sp, &ac->local_port); localp = remotep = NULL;
krb5_ret_int16 (sp, &ac->remote_port);
if (krb5_ret_int16 (sp, &ac->local_port) != 0)
goto failure;
if (krb5_ret_int16 (sp, &ac->remote_port) != 0)
goto failure;
if (flags & SC_KEYBLOCK) { if (flags & SC_KEYBLOCK) {
krb5_ret_keyblock (sp, &keyblock); if (krb5_ret_keyblock (sp, &keyblock) != 0)
goto failure;
krb5_auth_con_setkey (gssapi_krb5_context, ac, &keyblock); krb5_auth_con_setkey (gssapi_krb5_context, ac, &keyblock);
krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock); krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock);
} }
if (flags & SC_LOCAL_SUBKEY) { if (flags & SC_LOCAL_SUBKEY) {
krb5_ret_keyblock (sp, &keyblock); if (krb5_ret_keyblock (sp, &keyblock) != 0)
goto failure;
krb5_auth_con_setlocalsubkey (gssapi_krb5_context, ac, &keyblock); krb5_auth_con_setlocalsubkey (gssapi_krb5_context, ac, &keyblock);
krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock); krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock);
} }
if (flags & SC_REMOTE_SUBKEY) { if (flags & SC_REMOTE_SUBKEY) {
krb5_ret_keyblock (sp, &keyblock); if (krb5_ret_keyblock (sp, &keyblock) != 0)
goto failure;
krb5_auth_con_setremotesubkey (gssapi_krb5_context, ac, &keyblock); krb5_auth_con_setremotesubkey (gssapi_krb5_context, ac, &keyblock);
krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock); krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock);
} }
krb5_ret_int32 (sp, &ac->local_seqnumber); if (krb5_ret_int32 (sp, &ac->local_seqnumber))
krb5_ret_int32 (sp, &ac->remote_seqnumber); goto failure;
if (krb5_ret_int32 (sp, &ac->remote_seqnumber))
goto failure;
#if 0 if (krb5_ret_int32 (sp, &tmp) != 0)
{ goto failure;
size_t sz;
krb5_ret_data (sp, &data);
ac->authenticator = malloc (sizeof (*ac->authenticator));
if (ac->authenticator == NULL) {
*minor_status = ENOMEM;
ret = GSS_S_FAILURE;
goto failure;
}
kret = decode_Authenticator (data.data, data.length,
ac->authenticator, &sz);
krb5_data_free (&data);
if (kret) {
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
}
#endif
krb5_ret_int32 (sp, &tmp);
ac->keytype = tmp; ac->keytype = tmp;
krb5_ret_int32 (sp, &tmp); if (krb5_ret_int32 (sp, &tmp) != 0)
goto failure;
ac->cksumtype = tmp; ac->cksumtype = tmp;
/* names */ /* names */
krb5_ret_data (sp, &data); if (krb5_ret_data (sp, &data))
goto failure;
buffer.value = data.data; buffer.value = data.data;
buffer.length = data.length; buffer.length = data.length;
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID, ret = gss_import_name (minor_status, &buffer, GSS_C_NT_EXPORT_NAME,
&(*context_handle)->source); &(*context_handle)->source);
if (ret) {
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID,
&(*context_handle)->source);
if (ret) {
krb5_data_free (&data);
goto failure;
}
}
krb5_data_free (&data); krb5_data_free (&data);
if (ret)
goto failure;
krb5_ret_data (sp, &data); if (krb5_ret_data (sp, &data) != 0)
goto failure;
buffer.value = data.data; buffer.value = data.data;
buffer.length = data.length; buffer.length = data.length;
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID, ret = gss_import_name (minor_status, &buffer, GSS_C_NT_EXPORT_NAME,
&(*context_handle)->target); &(*context_handle)->target);
if (ret) {
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID,
&(*context_handle)->target);
if (ret) {
krb5_data_free (&data);
goto failure;
}
}
krb5_data_free (&data); krb5_data_free (&data);
if (ret)
goto failure;
krb5_ret_int32 (sp, &tmp); if (krb5_ret_int32 (sp, &tmp))
goto failure;
(*context_handle)->flags = tmp; (*context_handle)->flags = tmp;
krb5_ret_int32 (sp, &tmp); if (krb5_ret_int32 (sp, &tmp))
goto failure;
(*context_handle)->more_flags = tmp; (*context_handle)->more_flags = tmp;
if (krb5_ret_int32 (sp, &tmp) == 0)
(*context_handle)->lifetime = tmp;
else
(*context_handle)->lifetime = GSS_C_INDEFINITE;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
@@ -186,6 +202,10 @@ failure:
gss_release_name(&minor, &(*context_handle)->source); gss_release_name(&minor, &(*context_handle)->source);
if ((*context_handle)->target != NULL) if ((*context_handle)->target != NULL)
gss_release_name(&minor, &(*context_handle)->target); gss_release_name(&minor, &(*context_handle)->target);
if (localp)
krb5_free_address (gssapi_krb5_context, localp);
if (remotep)
krb5_free_address (gssapi_krb5_context, remotep);
free (*context_handle); free (*context_handle);
*context_handle = GSS_C_NO_CONTEXT; *context_handle = GSS_C_NO_CONTEXT;
return ret; return ret;

124
lib/gssapi/krb5/import_sec_context.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 1999 - 2003 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -57,6 +57,8 @@ gss_import_sec_context (
GSSAPI_KRB5_INIT (); GSSAPI_KRB5_INIT ();
localp = remotep = NULL;
sp = krb5_storage_from_mem (interprocess_token->value, sp = krb5_storage_from_mem (interprocess_token->value,
interprocess_token->length); interprocess_token->length);
if (sp == NULL) { if (sp == NULL) {
@@ -83,99 +85,113 @@ gss_import_sec_context (
/* flags */ /* flags */
krb5_ret_int32 (sp, &flags); *minor_status = 0;
if (krb5_ret_int32 (sp, &flags) != 0)
goto failure;
/* retrieve the auth context */ /* retrieve the auth context */
ac = (*context_handle)->auth_context; ac = (*context_handle)->auth_context;
krb5_ret_int32 (sp, &ac->flags); krb5_ret_int32 (sp, &ac->flags);
if (flags & SC_LOCAL_ADDRESS) if (flags & SC_LOCAL_ADDRESS) {
krb5_ret_address (sp, localp = &local); if (krb5_ret_address (sp, localp = &local) != 0)
else goto failure;
localp = NULL; }
if (flags & SC_REMOTE_ADDRESS)
krb5_ret_address (sp, remotep = &remote); if (flags & SC_REMOTE_ADDRESS) {
else if (krb5_ret_address (sp, remotep = &remote) != 0)
remotep = NULL; goto failure;
}
krb5_auth_con_setaddrs (gssapi_krb5_context, ac, localp, remotep); krb5_auth_con_setaddrs (gssapi_krb5_context, ac, localp, remotep);
if (localp) if (localp)
krb5_free_address (gssapi_krb5_context, localp); krb5_free_address (gssapi_krb5_context, localp);
if (remotep) if (remotep)
krb5_free_address (gssapi_krb5_context, remotep); krb5_free_address (gssapi_krb5_context, remotep);
krb5_ret_int16 (sp, &ac->local_port); localp = remotep = NULL;
krb5_ret_int16 (sp, &ac->remote_port);
if (krb5_ret_int16 (sp, &ac->local_port) != 0)
goto failure;
if (krb5_ret_int16 (sp, &ac->remote_port) != 0)
goto failure;
if (flags & SC_KEYBLOCK) { if (flags & SC_KEYBLOCK) {
krb5_ret_keyblock (sp, &keyblock); if (krb5_ret_keyblock (sp, &keyblock) != 0)
goto failure;
krb5_auth_con_setkey (gssapi_krb5_context, ac, &keyblock); krb5_auth_con_setkey (gssapi_krb5_context, ac, &keyblock);
krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock); krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock);
} }
if (flags & SC_LOCAL_SUBKEY) { if (flags & SC_LOCAL_SUBKEY) {
krb5_ret_keyblock (sp, &keyblock); if (krb5_ret_keyblock (sp, &keyblock) != 0)
goto failure;
krb5_auth_con_setlocalsubkey (gssapi_krb5_context, ac, &keyblock); krb5_auth_con_setlocalsubkey (gssapi_krb5_context, ac, &keyblock);
krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock); krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock);
} }
if (flags & SC_REMOTE_SUBKEY) { if (flags & SC_REMOTE_SUBKEY) {
krb5_ret_keyblock (sp, &keyblock); if (krb5_ret_keyblock (sp, &keyblock) != 0)
goto failure;
krb5_auth_con_setremotesubkey (gssapi_krb5_context, ac, &keyblock); krb5_auth_con_setremotesubkey (gssapi_krb5_context, ac, &keyblock);
krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock); krb5_free_keyblock_contents (gssapi_krb5_context, &keyblock);
} }
krb5_ret_int32 (sp, &ac->local_seqnumber); if (krb5_ret_int32 (sp, &ac->local_seqnumber))
krb5_ret_int32 (sp, &ac->remote_seqnumber); goto failure;
if (krb5_ret_int32 (sp, &ac->remote_seqnumber))
goto failure;
#if 0 if (krb5_ret_int32 (sp, &tmp) != 0)
{ goto failure;
size_t sz;
krb5_ret_data (sp, &data);
ac->authenticator = malloc (sizeof (*ac->authenticator));
if (ac->authenticator == NULL) {
*minor_status = ENOMEM;
ret = GSS_S_FAILURE;
goto failure;
}
kret = decode_Authenticator (data.data, data.length,
ac->authenticator, &sz);
krb5_data_free (&data);
if (kret) {
*minor_status = kret;
ret = GSS_S_FAILURE;
goto failure;
}
}
#endif
krb5_ret_int32 (sp, &tmp);
ac->keytype = tmp; ac->keytype = tmp;
krb5_ret_int32 (sp, &tmp); if (krb5_ret_int32 (sp, &tmp) != 0)
goto failure;
ac->cksumtype = tmp; ac->cksumtype = tmp;
/* names */ /* names */
krb5_ret_data (sp, &data); if (krb5_ret_data (sp, &data))
goto failure;
buffer.value = data.data; buffer.value = data.data;
buffer.length = data.length; buffer.length = data.length;
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID, ret = gss_import_name (minor_status, &buffer, GSS_C_NT_EXPORT_NAME,
&(*context_handle)->source); &(*context_handle)->source);
if (ret) {
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID,
&(*context_handle)->source);
if (ret) {
krb5_data_free (&data);
goto failure;
}
}
krb5_data_free (&data); krb5_data_free (&data);
if (ret)
goto failure;
krb5_ret_data (sp, &data); if (krb5_ret_data (sp, &data) != 0)
goto failure;
buffer.value = data.data; buffer.value = data.data;
buffer.length = data.length; buffer.length = data.length;
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID, ret = gss_import_name (minor_status, &buffer, GSS_C_NT_EXPORT_NAME,
&(*context_handle)->target); &(*context_handle)->target);
if (ret) {
ret = gss_import_name (minor_status, &buffer, GSS_C_NO_OID,
&(*context_handle)->target);
if (ret) {
krb5_data_free (&data);
goto failure;
}
}
krb5_data_free (&data); krb5_data_free (&data);
if (ret)
goto failure;
krb5_ret_int32 (sp, &tmp); if (krb5_ret_int32 (sp, &tmp))
goto failure;
(*context_handle)->flags = tmp; (*context_handle)->flags = tmp;
krb5_ret_int32 (sp, &tmp); if (krb5_ret_int32 (sp, &tmp))
goto failure;
(*context_handle)->more_flags = tmp; (*context_handle)->more_flags = tmp;
if (krb5_ret_int32 (sp, &tmp) == 0)
(*context_handle)->lifetime = tmp;
else
(*context_handle)->lifetime = GSS_C_INDEFINITE;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
@@ -186,6 +202,10 @@ failure:
gss_release_name(&minor, &(*context_handle)->source); gss_release_name(&minor, &(*context_handle)->source);
if ((*context_handle)->target != NULL) if ((*context_handle)->target != NULL)
gss_release_name(&minor, &(*context_handle)->target); gss_release_name(&minor, &(*context_handle)->target);
if (localp)
krb5_free_address (gssapi_krb5_context, localp);
if (remotep)
krb5_free_address (gssapi_krb5_context, remotep);
free (*context_handle); free (*context_handle);
*context_handle = GSS_C_NO_CONTEXT; *context_handle = GSS_C_NO_CONTEXT;
return ret; return ret;