[src/netbsd-1-5]: src/crypto/dist/heimdal/lib/gssapi Pull up revisions 1.2-1....

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/62c9693d7ba8
branches:  netbsd-1-5
changeset: 491174:62c9693d7ba8
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:27:47 2001 +0000

description:
Pull up revisions 1.2-1.4 (via patch, requested by assar):
  Upgrade Heimdal to version 0.3e.

diffstat:

 crypto/dist/heimdal/lib/gssapi/gssapi.h |  48 ++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 7 deletions(-)

diffs (105 lines):

diff -r 09dbda07a2a1 -r 62c9693d7ba8 crypto/dist/heimdal/lib/gssapi/gssapi.h
--- a/crypto/dist/heimdal/lib/gssapi/gssapi.h   Thu Apr 05 23:27:11 2001 +0000
+++ b/crypto/dist/heimdal/lib/gssapi/gssapi.h   Thu Apr 05 23:27:47 2001 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1998, 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: gssapi.h,v 1.1.1.1.2.4 2001/01/26 02:41:14 jhawk Exp $ */
+/* $Id: gssapi.h,v 1.1.1.1.2.5 2001/04/05 23:27:47 he Exp $ */
 
 #ifndef GSSAPI_H_
 #define GSSAPI_H_
@@ -55,6 +55,8 @@
 
 typedef u_int32_t OM_uint32;
 
+typedef u_int32_t gss_uint32;
+
 /*
  * This is to avoid having to include <krb5.h>
  */
@@ -88,9 +90,9 @@
 } gss_OID_set_desc, *gss_OID_set;
 
 struct krb5_keytab_data;
+struct krb5_ccache_data;
 
 typedef int gss_cred_usage_t;
-struct krb5_ccache_data;
 
 typedef struct gss_cred_id_t_desc_struct {
   gss_name_t principal;
@@ -205,6 +207,9 @@
  */
 #define GSS_C_QOP_DEFAULT 0
 
+#define GSS_KRB5_CONF_C_QOP_DES                0x0100
+#define GSS_KRB5_CONF_C_QOP_DES3_KD    0x0200
+
 /*
  * Expiration time of 2^32-1 seconds means infinite lifetime for a
  * credential or security context
@@ -255,10 +260,30 @@
  * gss_OID_desc object containing the value
  * {6, (void *)"\x2b\x06\x01\x05\x06\x02"},
  * corresponding to an object-identifier value of
- * {1(iso), 3(org), 6(dod), 1(internet), 5(security),
- * 6(nametypes), 2(gss-host-based-services)}.  The constant
- * GSS_C_NT_HOSTBASED_SERVICE should be initialized to point
- * to that gss_OID_desc.
+ * {iso(1) org(3) dod(6) internet(1) security(5)
+ * nametypes(6) gss-host-based-services(2)).  The constant
+ * GSS_C_NT_HOSTBASED_SERVICE_X should be initialized to point
+ * to that gss_OID_desc.  This is a deprecated OID value, and
+ * implementations wishing to support hostbased-service names
+ * should instead use the GSS_C_NT_HOSTBASED_SERVICE OID,
+ * defined below, to identify such names;
+ * GSS_C_NT_HOSTBASED_SERVICE_X should be accepted a synonym
+ * for GSS_C_NT_HOSTBASED_SERVICE when presented as an input
+ * parameter, but should not be emitted by GSS-API
+ * implementations
+ */
+extern gss_OID GSS_C_NT_HOSTBASED_SERVICE_X;
+
+/*
+ * The implementation must reserve static storage for a
+ * gss_OID_desc object containing the value
+ * {10, (void *)"\x2a\x86\x48\x86\xf7\x12"
+ *              "\x01\x02\x01\x04"}, corresponding to an
+ * object-identifier value of {iso(1) member-body(2)
+ * Unites States(840) mit(113554) infosys(1) gssapi(2)
+ * generic(1) service_name(4)}.  The constant
+ * GSS_C_NT_HOSTBASED_SERVICE should be initialized
+ * to point to that gss_OID_desc.
  */
 extern gss_OID GSS_C_NT_HOSTBASED_SERVICE;
 
@@ -297,6 +322,10 @@
 
 extern gss_OID GSS_KRB5_MECHANISM;
 
+/* for compatibility with MIT api */
+
+#define gss_mech_krb5 GSS_KRB5_MECHANISM
+
 /* Major status codes */
 
 #define GSS_S_COMPLETE 0
@@ -741,4 +770,9 @@
 OM_uint32 gsskrb5_register_acceptor_identity
         (char *identity);
 
+OM_uint32 gss_krb5_copy_ccache
+       (OM_uint32 *minor,
+        gss_cred_id_t cred,
+        struct krb5_ccache_data *out);
+
 #endif /* GSSAPI_H_ */