[30107] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix grouping of GGF extensions in gssapi_ext.h
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Feb 15 16:07:41 2018
Date: Thu, 15 Feb 2018 15:32:03 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201802152032.w1FKW3aO008128@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/accdc44d3aa603bfed81eb8ca3bc269b2a647dca
commit accdc44d3aa603bfed81eb8ca3bc269b2a647dca
Author: Robbie Harwood <rharwood@redhat.com>
Date: Thu Jan 11 13:47:10 2018 -0500
Fix grouping of GGF extensions in gssapi_ext.h
Move gss_import/export_cred to be with the rest of the GGF extensions
and mark them as using Heimdal's signatures. Also add clarifying
comments that gss_set_cred_option and gssspi_mech_invoke are not part
of the GGF extensions.
src/lib/gssapi/generic/gssapi_ext.h | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h
index 9d3a7e7..074a375 100644
--- a/src/lib/gssapi/generic/gssapi_ext.h
+++ b/src/lib/gssapi/generic/gssapi_ext.h
@@ -169,12 +169,31 @@ OM_uint32 KRB5_CALLCONV gss_set_sec_context_option
const gss_OID /*desired_object*/,
const gss_buffer_t /*value*/);
+/*
+ * Export import cred extensions from GGF, but using Heimdal's signatures
+ */
+OM_uint32 KRB5_CALLCONV gss_export_cred
+ (OM_uint32 * /* minor_status */,
+ gss_cred_id_t /* cred_handle */,
+ gss_buffer_t /* token */);
+
+OM_uint32 KRB5_CALLCONV gss_import_cred
+ (OM_uint32 * /* minor_status */,
+ gss_buffer_t /* token */,
+ gss_cred_id_t * /* cred_handle */);
+
+/*
+ * Heimdal extension
+ */
OM_uint32 KRB5_CALLCONV gss_set_cred_option
(OM_uint32 * /*minor_status*/,
gss_cred_id_t * /*cred*/,
const gss_OID /*desired_object*/,
const gss_buffer_t /*value*/);
+/*
+ * Call the given method on the given mechanism
+ */
OM_uint32 KRB5_CALLCONV gssspi_mech_invoke
(OM_uint32 * /*minor_status*/,
const gss_OID /*desired_mech*/,
@@ -559,18 +578,6 @@ gss_store_cred_into(
gss_OID_set *, /* elements_stored */
gss_cred_usage_t *); /* cred_usage_stored */
-OM_uint32 KRB5_CALLCONV
-gss_export_cred(
- OM_uint32 *, /* minor_status */
- gss_cred_id_t, /* cred_handle */
- gss_buffer_t); /* token */
-
-OM_uint32 KRB5_CALLCONV
-gss_import_cred(
- OM_uint32 *, /* minor_status */
- gss_buffer_t, /* token */
- gss_cred_id_t *); /* cred_handle */
-
#ifdef __cplusplus
}
#endif
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
