From 1ad028847b46ca5d944bbcfadfcb1bd8defd3fd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 14 Mar 2004 14:15:56 +0000 Subject: [PATCH] add partial support for CFX git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13514 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/gssapi_locl.h | 12 +++++++++--- lib/gssapi/krb5/gssapi_locl.h | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/lib/gssapi/gssapi_locl.h b/lib/gssapi/gssapi_locl.h index 145195169..06b57a87b 100644 --- a/lib/gssapi/gssapi_locl.h +++ b/lib/gssapi/gssapi_locl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -60,7 +60,10 @@ typedef struct gss_ctx_id_t_desc_struct { gss_name_t source, target; OM_uint32 flags; enum { LOCAL = 1, OPEN = 2, - COMPAT_OLD_DES3 = 4, COMPAT_OLD_DES3_SELECTED = 8 } more_flags; + COMPAT_OLD_DES3 = 4, + COMPAT_OLD_DES3_SELECTED = 8, + ACCEPTOR_SUBKEY = 16 + } more_flags; struct krb5_ticket *ticket; OM_uint32 lifetime; HEIMDAL_MUTEX ctx_id_mutex; @@ -108,6 +111,9 @@ krb5_error_code gssapi_krb5_init (void); struct gssapi_thr_context * gssapi_get_thread_context(int); +void +gsskrb5_is_cfx(gss_ctx_id_t, int *); + OM_uint32 gssapi_krb5_create_8003_checksum ( OM_uint32 *minor_status, @@ -243,7 +249,7 @@ gssapi_lifetime_left(OM_uint32 *, OM_uint32, OM_uint32 *); OM_uint32 gssapi_msg_order_create(OM_uint32 *, struct gss_msg_order **, - OM_uint32, OM_uint32, OM_uint32); + OM_uint32, OM_uint32, OM_uint32, int); OM_uint32 gssapi_msg_order_destroy(struct gss_msg_order **); diff --git a/lib/gssapi/krb5/gssapi_locl.h b/lib/gssapi/krb5/gssapi_locl.h index 145195169..06b57a87b 100644 --- a/lib/gssapi/krb5/gssapi_locl.h +++ b/lib/gssapi/krb5/gssapi_locl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -60,7 +60,10 @@ typedef struct gss_ctx_id_t_desc_struct { gss_name_t source, target; OM_uint32 flags; enum { LOCAL = 1, OPEN = 2, - COMPAT_OLD_DES3 = 4, COMPAT_OLD_DES3_SELECTED = 8 } more_flags; + COMPAT_OLD_DES3 = 4, + COMPAT_OLD_DES3_SELECTED = 8, + ACCEPTOR_SUBKEY = 16 + } more_flags; struct krb5_ticket *ticket; OM_uint32 lifetime; HEIMDAL_MUTEX ctx_id_mutex; @@ -108,6 +111,9 @@ krb5_error_code gssapi_krb5_init (void); struct gssapi_thr_context * gssapi_get_thread_context(int); +void +gsskrb5_is_cfx(gss_ctx_id_t, int *); + OM_uint32 gssapi_krb5_create_8003_checksum ( OM_uint32 *minor_status, @@ -243,7 +249,7 @@ gssapi_lifetime_left(OM_uint32 *, OM_uint32, OM_uint32 *); OM_uint32 gssapi_msg_order_create(OM_uint32 *, struct gss_msg_order **, - OM_uint32, OM_uint32, OM_uint32); + OM_uint32, OM_uint32, OM_uint32, int); OM_uint32 gssapi_msg_order_destroy(struct gss_msg_order **);