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

add decap functions that doesn't take the token type

Browse Source 
also make all decap function take the oid mech that they should use


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12637 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-08-25 19:57:43 +00:00
parent 0fed18d468
commit b50861a481
2 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/gssapi/decapsulate.c
View File

@@ -36,9 +36,9 @@
RCSID("$Id$");
OM_uint32
gssapi_krb5_verify_header(u_char **str,
size_t total_len,
char *type)
_gssapi_verify_mech_header(u_char **str,
size_t total_len,
gss_OID oid)
{
size_t len, len_len, mech_len, foo;
int e;
@@ -59,32 +59,55 @@ gssapi_krb5_verify_header(u_char **str,
if (e)
return GSS_S_DEFECTIVE_TOKEN;
p += foo;
if (mech_len != GSS_KRB5_MECHANISM->length)
if (mech_len != oid->length)
return GSS_S_BAD_MECH;
if (memcmp(p,
GSS_KRB5_MECHANISM->elements,
GSS_KRB5_MECHANISM->length) != 0)
oid->elements,
oid->length) != 0)
return GSS_S_BAD_MECH;
p += mech_len;
if (memcmp (p, type, 2) != 0)
return GSS_S_DEFECTIVE_TOKEN;
p += 2;
*str = p;
return GSS_S_COMPLETE;
}
OM_uint32
gssapi_krb5_verify_header(u_char **str,
size_t total_len,
u_char *type,
gss_OID oid)
{
OM_uint32 ret;
size_t len;
u_char *p = *str;
ret = _gssapi_verify_mech_header(str, total_len, oid);
if (ret)
return ret;
len = total_len - (*str - p);
if (len < 2)
return GSS_S_DEFECTIVE_TOKEN;
if (memcmp (*str, type, 2) != 0)
return GSS_S_DEFECTIVE_TOKEN;
*str += 2;
return 0;
}
/*
* Remove the GSS-API wrapping from `in_token' giving `out_data.
* Does not copy data, so just free `in_token'.
*/
OM_uint32
gssapi_krb5_decapsulate(
OM_uint32 *minor_status,
gssapi_krb5_decapsulate(OM_uint32 *minor_status,
gss_buffer_t input_token_buffer,
krb5_data *out_data,
char *type
)
char *type,
gss_OID oid)
{
u_char *p;
OM_uint32 ret;
@@ -92,7 +115,8 @@ gssapi_krb5_decapsulate(
p = input_token_buffer->value;
ret = gssapi_krb5_verify_header(&p,
input_token_buffer->length,
type);
type,
oid);
if (ret) {
*minor_status = 0;
return ret;

52
lib/gssapi/krb5/decapsulate.c
View File

@@ -36,9 +36,9 @@
RCSID("$Id$");
OM_uint32
gssapi_krb5_verify_header(u_char **str,
size_t total_len,
char *type)
_gssapi_verify_mech_header(u_char **str,
size_t total_len,
gss_OID oid)
{
size_t len, len_len, mech_len, foo;
int e;
@@ -59,32 +59,55 @@ gssapi_krb5_verify_header(u_char **str,
if (e)
return GSS_S_DEFECTIVE_TOKEN;
p += foo;
if (mech_len != GSS_KRB5_MECHANISM->length)
if (mech_len != oid->length)
return GSS_S_BAD_MECH;
if (memcmp(p,
GSS_KRB5_MECHANISM->elements,
GSS_KRB5_MECHANISM->length) != 0)
oid->elements,
oid->length) != 0)
return GSS_S_BAD_MECH;
p += mech_len;
if (memcmp (p, type, 2) != 0)
return GSS_S_DEFECTIVE_TOKEN;
p += 2;
*str = p;
return GSS_S_COMPLETE;
}
OM_uint32
gssapi_krb5_verify_header(u_char **str,
size_t total_len,
u_char *type,
gss_OID oid)
{
OM_uint32 ret;
size_t len;
u_char *p = *str;
ret = _gssapi_verify_mech_header(str, total_len, oid);
if (ret)
return ret;
len = total_len - (*str - p);
if (len < 2)
return GSS_S_DEFECTIVE_TOKEN;
if (memcmp (*str, type, 2) != 0)
return GSS_S_DEFECTIVE_TOKEN;
*str += 2;
return 0;
}
/*
* Remove the GSS-API wrapping from `in_token' giving `out_data.
* Does not copy data, so just free `in_token'.
*/
OM_uint32
gssapi_krb5_decapsulate(
OM_uint32 *minor_status,
gssapi_krb5_decapsulate(OM_uint32 *minor_status,
gss_buffer_t input_token_buffer,
krb5_data *out_data,
char *type
)
char *type,
gss_OID oid)
{
u_char *p;
OM_uint32 ret;
@@ -92,7 +115,8 @@ gssapi_krb5_decapsulate(
p = input_token_buffer->value;
ret = gssapi_krb5_verify_header(&p,
input_token_buffer->length,
type);
type,
oid);
if (ret) {
*minor_status = 0;
return ret;