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

encap/decap now takes a oid

Browse Source 
if the enctype/keytype is arcfour, return error
add hook for cfx


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12640 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-08-25 20:06:04 +00:00
parent c8cf8c9880
commit bb7b50eba4
8 changed files with 148 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/gssapi/unwrap.c
View File

@@ -88,7 +88,8 @@ unwrap_des
p = input_message_buffer->value;
ret = gssapi_krb5_verify_header (&p,
input_message_buffer->length,
"\x02\x01");
"\x02\x01",
GSS_KRB5_MECHANISM);
if (ret)
return ret;
@@ -226,7 +227,8 @@ unwrap_des3
p = input_message_buffer->value;
ret = gssapi_krb5_verify_header (&p,
input_message_buffer->length,
"\x02\x01");
"\x02\x01",
GSS_KRB5_MECHANISM);
if (ret)
return ret;
@@ -426,10 +428,20 @@ OM_uint32 gss_unwrap
input_message_buffer, output_message_buffer,
conf_state, qop_state, key);
break;
default :
*minor_status = KRB5_PROG_ETYPE_NOSUPP;
case KEYTYPE_ARCFOUR:
*minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
ret = GSS_S_FAILURE;
break;
default :
#ifdef HAVE_GSSAPI_CFX
ret = unwrap_cfx (minor_status, context_handle,
input_message_buffer, output_message_buffer,
conf_state, qop_state, key);
#else
*minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
ret = GSS_S_FAILURE;
#endif
break;
}
krb5_free_keyblock (gssapi_krb5_context, key);
return ret;