encap/decap now takes a oid

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

View File

@@ -59,7 +59,8 @@ verify_mic_des
p = token_buffer->value;
ret = gssapi_krb5_verify_header (&p,
token_buffer->length,
type);
type,
GSS_KRB5_MECHANISM);
if (ret)
return ret;
@@ -151,7 +152,8 @@ verify_mic_des3
p = token_buffer->value;
ret = gssapi_krb5_verify_header (&p,
token_buffer->length,
type);
type,
GSS_KRB5_MECHANISM);
if (ret)
return ret;
@@ -295,10 +297,19 @@ gss_verify_mic_internal
message_buffer, token_buffer, qop_state, key,
type);
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 = verify_mic_cfx (minor_status, context_handle,
message_buffer, token_buffer, 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);