From 384bd1719c730a70c8f9a19d8e9c91b639131c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 5 Apr 2004 19:22:01 +0000 Subject: [PATCH] (gsskrb5_is_cfx): krb5_keyblock->keytype is an enctype, not keytype git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13687 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/accept_sec_context.c | 10 +++++++--- lib/gssapi/krb5/accept_sec_context.c | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c index 8201725e1..595956dbf 100644 --- a/lib/gssapi/accept_sec_context.c +++ b/lib/gssapi/accept_sec_context.c @@ -91,9 +91,13 @@ gsskrb5_is_cfx(gss_ctx_id_t context_handle, int *is_cfx) return; switch (key->keytype) { - case KEYTYPE_DES : - case KEYTYPE_ARCFOUR: - case KEYTYPE_DES3 : + case ETYPE_DES_CBC_CRC: + case ETYPE_DES_CBC_MD4: + case ETYPE_DES_CBC_MD5: + case ETYPE_DES3_CBC_MD5: + case ETYPE_DES3_CBC_SHA1: + case ETYPE_ARCFOUR_HMAC_MD5: + case ETYPE_ARCFOUR_HMAC_MD5_56: break; default : *is_cfx = 1; diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c index 8201725e1..595956dbf 100644 --- a/lib/gssapi/krb5/accept_sec_context.c +++ b/lib/gssapi/krb5/accept_sec_context.c @@ -91,9 +91,13 @@ gsskrb5_is_cfx(gss_ctx_id_t context_handle, int *is_cfx) return; switch (key->keytype) { - case KEYTYPE_DES : - case KEYTYPE_ARCFOUR: - case KEYTYPE_DES3 : + case ETYPE_DES_CBC_CRC: + case ETYPE_DES_CBC_MD4: + case ETYPE_DES_CBC_MD5: + case ETYPE_DES3_CBC_MD5: + case ETYPE_DES3_CBC_SHA1: + case ETYPE_ARCFOUR_HMAC_MD5: + case ETYPE_ARCFOUR_HMAC_MD5_56: break; default : *is_cfx = 1;