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

encap/decap now takes a oid

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12639 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-08-25 20:02:49 +00:00
parent a339bd774f
commit c8cf8c9880
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gssapi/accept_sec_context.c
View File

@@ -212,7 +212,8 @@ gss_accept_sec_context
ret = gssapi_krb5_decapsulate (minor_status, ret = gssapi_krb5_decapsulate (minor_status,
input_token_buffer, input_token_buffer,
&indata, &indata,
"\x01\x00"); "\x01\x00",
GSS_KRB5_MECHANISM);
if (ret) if (ret)
goto failure; goto failure;
@@ -411,7 +412,8 @@ gss_accept_sec_context
ret = gssapi_krb5_encapsulate (minor_status, ret = gssapi_krb5_encapsulate (minor_status,
&outbuf, &outbuf,
output_token, output_token,
"\x02\x00"); "\x02\x00",
GSS_KRB5_MECHANISM);
krb5_data_free (&outbuf); krb5_data_free (&outbuf);
if (ret) if (ret)
goto failure; goto failure;
@@ -425,7 +427,7 @@ gss_accept_sec_context
#endif #endif
{ {
OM_uint32 seq_number; int32_t seq_number;
krb5_auth_getremoteseqnumber (gssapi_krb5_context, krb5_auth_getremoteseqnumber (gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,

4
lib/gssapi/init_sec_context.c
View File

@@ -417,7 +417,7 @@ init_auth
} }
ret = gssapi_krb5_encapsulate (minor_status, &outbuf, output_token, ret = gssapi_krb5_encapsulate (minor_status, &outbuf, output_token,
"\x01\x00"); "\x01\x00", GSS_KRB5_MECHANISM);
if (ret) if (ret)
goto failure; goto failure;
@@ -497,7 +497,7 @@ repl_mutual
*actual_mech_type = GSS_KRB5_MECHANISM; *actual_mech_type = GSS_KRB5_MECHANISM;
ret = gssapi_krb5_decapsulate (minor_status, input_token, &indata, ret = gssapi_krb5_decapsulate (minor_status, input_token, &indata,
"\x02\x00"); "\x02\x00", GSS_KRB5_MECHANISM);
if (ret) { if (ret) {
HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex); HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
/* XXX - Handle AP_ERROR */ /* XXX - Handle AP_ERROR */

8
lib/gssapi/krb5/accept_sec_context.c
View File

@@ -212,7 +212,8 @@ gss_accept_sec_context
ret = gssapi_krb5_decapsulate (minor_status, ret = gssapi_krb5_decapsulate (minor_status,
input_token_buffer, input_token_buffer,
&indata, &indata,
"\x01\x00"); "\x01\x00",
GSS_KRB5_MECHANISM);
if (ret) if (ret)
goto failure; goto failure;
@@ -411,7 +412,8 @@ gss_accept_sec_context
ret = gssapi_krb5_encapsulate (minor_status, ret = gssapi_krb5_encapsulate (minor_status,
&outbuf, &outbuf,
output_token, output_token,
"\x02\x00"); "\x02\x00",
GSS_KRB5_MECHANISM);
krb5_data_free (&outbuf); krb5_data_free (&outbuf);
if (ret) if (ret)
goto failure; goto failure;
@@ -425,7 +427,7 @@ gss_accept_sec_context
#endif #endif
{ {
OM_uint32 seq_number; int32_t seq_number;
krb5_auth_getremoteseqnumber (gssapi_krb5_context, krb5_auth_getremoteseqnumber (gssapi_krb5_context,
(*context_handle)->auth_context, (*context_handle)->auth_context,

4
lib/gssapi/krb5/init_sec_context.c
View File

@@ -417,7 +417,7 @@ init_auth
} }
ret = gssapi_krb5_encapsulate (minor_status, &outbuf, output_token, ret = gssapi_krb5_encapsulate (minor_status, &outbuf, output_token,
"\x01\x00"); "\x01\x00", GSS_KRB5_MECHANISM);
if (ret) if (ret)
goto failure; goto failure;
@@ -497,7 +497,7 @@ repl_mutual
*actual_mech_type = GSS_KRB5_MECHANISM; *actual_mech_type = GSS_KRB5_MECHANISM;
ret = gssapi_krb5_decapsulate (minor_status, input_token, &indata, ret = gssapi_krb5_decapsulate (minor_status, input_token, &indata,
"\x02\x00"); "\x02\x00", GSS_KRB5_MECHANISM);
if (ret) { if (ret) {
HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex); HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
/* XXX - Handle AP_ERROR */ /* XXX - Handle AP_ERROR */