Renamed filenames so they would be unique in an 8.3 filesystem. Added
authorTheodore Tso <tytso@mit.edu>
Sat, 18 Nov 1995 03:11:26 +0000 (03:11 +0000)
committerTheodore Tso <tytso@mit.edu>
Sat, 18 Nov 1995 03:11:26 +0000 (03:11 +0000)
GSSAPI V2 functions to mechglueP.h (now mglueP.h)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7114 dc483132-0cff-0310-8789-dd5450dbe970

29 files changed:
src/lib/gssapi/mechglue/Makefile.in
src/lib/gssapi/mechglue/add_mechanism.c
src/lib/gssapi/mechglue/configure.in
src/lib/gssapi/mechglue/g_accept_sec_context.c [moved from src/lib/gssapi/mechglue/gss_accept_sec_context.c with 99% similarity]
src/lib/gssapi/mechglue/g_acquire_cred.c [moved from src/lib/gssapi/mechglue/gss_acquire_cred.c with 99% similarity]
src/lib/gssapi/mechglue/g_compare_name.c [moved from src/lib/gssapi/mechglue/gss_compare_name.c with 95% similarity]
src/lib/gssapi/mechglue/g_context_time.c [moved from src/lib/gssapi/mechglue/gss_context_time.c with 97% similarity]
src/lib/gssapi/mechglue/g_delete_sec_context.c [moved from src/lib/gssapi/mechglue/gss_delete_sec_context.c with 98% similarity]
src/lib/gssapi/mechglue/g_dsp_name.c [moved from src/lib/gssapi/mechglue/gss_display_name.c with 95% similarity]
src/lib/gssapi/mechglue/g_dsp_status.c [moved from src/lib/gssapi/mechglue/gss_display_status.c with 91% similarity]
src/lib/gssapi/mechglue/g_imp_name.c [moved from src/lib/gssapi/mechglue/gss_import_name.c with 96% similarity]
src/lib/gssapi/mechglue/g_indicate_mechs.c [moved from src/lib/gssapi/mechglue/gss_indicate_mechs.c with 98% similarity]
src/lib/gssapi/mechglue/g_init_sec_context.c [moved from src/lib/gssapi/mechglue/gss_init_sec_context.c with 94% similarity]
src/lib/gssapi/mechglue/g_initialize.c [moved from src/lib/gssapi/mechglue/gss_initialize.c with 97% similarity]
src/lib/gssapi/mechglue/g_inquire_cred.c [moved from src/lib/gssapi/mechglue/gss_inquire_cred.c with 99% similarity]
src/lib/gssapi/mechglue/g_process_context.c [moved from src/lib/gssapi/mechglue/gss_process_context.c with 97% similarity]
src/lib/gssapi/mechglue/g_rel_buffer.c [moved from src/lib/gssapi/mechglue/gss_release_buffer.c with 96% similarity]
src/lib/gssapi/mechglue/g_rel_cred.c [moved from src/lib/gssapi/mechglue/gss_release_cred.c with 98% similarity]
src/lib/gssapi/mechglue/g_rel_name.c [moved from src/lib/gssapi/mechglue/gss_release_name.c with 89% similarity]
src/lib/gssapi/mechglue/g_rel_oid_set.c [moved from src/lib/gssapi/mechglue/gss_release_oid_set.c with 96% similarity]
src/lib/gssapi/mechglue/g_seal.c [moved from src/lib/gssapi/mechglue/gss_seal.c with 69% similarity]
src/lib/gssapi/mechglue/g_sign.c [moved from src/lib/gssapi/mechglue/gss_sign.c with 73% similarity]
src/lib/gssapi/mechglue/g_unseal.c [moved from src/lib/gssapi/mechglue/gss_unseal.c with 69% similarity]
src/lib/gssapi/mechglue/g_verify.c [moved from src/lib/gssapi/mechglue/gss_verify.c with 72% similarity]
src/lib/gssapi/mechglue/get_mechanism.c
src/lib/gssapi/mechglue/get_mtype.c [moved from src/lib/gssapi/mechglue/get_mech_type.c with 98% similarity]
src/lib/gssapi/mechglue/gssd_pname_to_uid.c
src/lib/gssapi/mechglue/internal_name.c
src/lib/gssapi/mechglue/mglueP.h [moved from src/lib/gssapi/mechglue/mechglueP.h with 82% similarity]

index b32292f94d54184f2f0aee05d31c3f6c3474b85a..90cbd7b58c5930ee05d06c72b1011b0521a9fb19 100644 (file)
@@ -8,72 +8,80 @@ CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 LIBDONE=DONE
 LIB_SUBDIRSS=.
 
-SRCS   = gss_acquire_cred.c \
-         gss_release_cred.c \
-         gss_init_sec_context.c \
-         gss_accept_sec_context.c \
-         gss_process_context.c \
-         gss_delete_sec_context.c \
-         gss_context_time.c \
-         gss_sign.c \
-         gss_verify.c \
-         gss_seal.c \
-         gss_unseal.c \
-         gss_display_status.c \
-         gss_indicate_mechs.c \
-         gss_compare_name.c \
-         gss_display_name.c \
-         gss_import_name.c \
-         gss_release_name.c \
-         gss_release_buffer.c \
-         gss_release_oid_set.c \
-         gss_inquire_cred.c \
-         gss_initialize.c \
-         get_mech_type.c \
+SRCS   = g_acquire_cred.c \
+         g_rel_cred.c \
+         g_init_sec_context.c \
+         g_accept_sec_context.c \
+         g_process_context.c \
+         g_delete_sec_context.c \
+         g_context_time.c \
+         g_sign.c \
+         g_verify.c \
+         g_seal.c \
+         g_unseal.c \
+         g_dsp_status.c \
+         g_indicate_mechs.c \
+         g_compare_name.c \
+         g_dsp_name.c \
+         g_imp_name.c \
+         g_rel_name.c \
+         g_rel_buffer.c \
+         g_rel_oid_set.c \
+         g_inquire_cred.c \
+         g_initialize.c \
+         get_mtype.c \
          get_mechanism.c \
          internal_name.c \
          gssd_pname_to_uid.c \
          add_mechanism.c
 
-OBJS   = gss_acquire_cred.$(OBJEXT) \
-         gss_release_cred.$(OBJEXT) \
-         gss_init_sec_context.$(OBJEXT) \
-         gss_accept_sec_context.$(OBJEXT) \
-         gss_process_context.$(OBJEXT) \
-         gss_delete_sec_context.$(OBJEXT) \
-         gss_context_time.$(OBJEXT) \
-         gss_sign.$(OBJEXT) \
-         gss_verify.$(OBJEXT) \
-         gss_seal.$(OBJEXT) \
-         gss_unseal.$(OBJEXT) \
-         gss_display_status.$(OBJEXT) \
-         gss_indicate_mechs.$(OBJEXT) \
-         gss_compare_name.$(OBJEXT) \
-         gss_display_name.$(OBJEXT) \
-         gss_import_name.$(OBJEXT) \
-         gss_release_name.$(OBJEXT) \
-         gss_release_buffer.$(OBJEXT) \
-         gss_release_oid_set.$(OBJEXT) \
-         gss_inquire_cred.$(OBJEXT) \
-         gss_initialize.$(OBJEXT) \
-         get_mech_type.$(OBJEXT) \
+OBJS   = g_acquire_cred.$(OBJEXT) \
+         g_rel_cred.$(OBJEXT) \
+         g_init_sec_context.$(OBJEXT) \
+         g_accept_sec_context.$(OBJEXT) \
+         g_process_context.$(OBJEXT) \
+         g_delete_sec_context.$(OBJEXT) \
+         g_context_time.$(OBJEXT) \
+         g_sign.$(OBJEXT) \
+         g_verify.$(OBJEXT) \
+         g_seal.$(OBJEXT) \
+         g_unseal.$(OBJEXT) \
+         g_dsp_status.$(OBJEXT) \
+         g_indicate_mechs.$(OBJEXT) \
+         g_compare_name.$(OBJEXT) \
+         g_dsp_name.$(OBJEXT) \
+         g_imp_name.$(OBJEXT) \
+         g_rel_name.$(OBJEXT) \
+         g_rel_buffer.$(OBJEXT) \
+         g_rel_oid_set.$(OBJEXT) \
+         g_inquire_cred.$(OBJEXT) \
+         g_initialize.$(OBJEXT) \
+         get_mtype.$(OBJEXT) \
          get_mechanism.$(OBJEXT) \
          internal_name.$(OBJEXT) \
          gssd_pname_to_uid.$(OBJEXT) \
          add_mechanism.$(OBJEXT)
 
+EHDRDIR= $(BUILDTOP)$(S)include$(S)gssapi
 EXPORTED_HEADERS = mechglue.h
 
-all:: all-$(WHAT) $(OBJS)
+.c.o:
+       $(CC) $(CFLAGS) -c $(srcdir)/$*.c
+@SHARED_RULE@
 
-all-unix::
+all:: all-$(WHAT) 
 
-all-mac::
+all-unix:: shared includes $(OBJS)
 
-all-windows::
+all-mac:: shared includes $(OBJS)
+
+all-windows:: includes $(OBJS)
        if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
        copy mechglue.h $(EHDRDIR)
 
+shared:
+       mkdir shared
+
 unixmac: 
 
 libgssapi.$(LIBEXT): $(OBJS)
@@ -83,8 +91,10 @@ libgssapi.$(LIBEXT): $(OBJS)
 clean:: clean-$(WHAT)
 
 clean-unix::
+       $(RM) shared/*
  
 clean-mac::
+       $(RM) shared/*
  
 clean-windows::
        $(RM) $(EHDRDIR)\gssapi.h $(EHDRDIR)\gssapi_generic.h
@@ -96,3 +106,5 @@ install::
        do $(INSTALL_DATA) $(srcdir)$(S)$$f     \
                $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi$(S)$$f ; \
        done
+
+includes::
index fa5ea532236c1211e10944ef1a268aab42ca96c4..398f0503f8baf59231de380a72fa7c79c84fed45 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 #include <errno.h>
 
 static struct gss_config null_mech = {
index 3cd9048dbcc3acd2ce04ba3092920cf4f6648a68..755d6e2a56f4059bcb2e4d8dfb7ec2861408b9fb 100644 (file)
@@ -3,9 +3,11 @@ CONFIG_RULES
 AC_PROG_ARCHIVE
 AC_PROG_RANLIB
 AC_PROG_INSTALL
+V5_SHARED_LIB_OBJS
+SubdirLibraryRule([${OBJS}])
 CopySrcHeader(mechglue.h,[$(EHDRDIR)])
-AppendRule([install:: libgssapi.[$](LIBEXT)
-       [$](INSTALL_DATA) libgssapi.[$](LIBEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libgssapi.[$](LIBEXT)])
-LinkFileDir([$](TOPLIBD)/libgssapi.[$](LIBEXT),libgssapi.[$](LIBEXT),./gssapi/mechglue)
-AppendRule([all:: [$](TOPLIBD)/libgssapi.[$](LIBEXT)])
+dnl AppendRule([install:: libgssapi.[$](LIBEXT)
+dnl    [$](INSTALL_DATA) libgssapi.[$](LIBEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libgssapi.[$](LIBEXT)])
+dnl LinkFileDir([$](TOPLIBD)/libgssapi.[$](LIBEXT),libgssapi.[$](LIBEXT),./gssapi/mechglue)
+dnl AppendRule([all:: [$](TOPLIBD)/libgssapi.[$](LIBEXT)])
 V5_AC_OUTPUT_MAKEFILE
similarity index 99%
rename from src/lib/gssapi/mechglue/gss_accept_sec_context.c
rename to src/lib/gssapi/mechglue/g_accept_sec_context.c
index e9fd1193c00c9e428362a92ee0510de155fdd0d1..31162d842eef24b068541686c373b1ee3df82f57 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_accept_sec_context (minor_status,
@@ -29,7 +29,7 @@ gss_channel_bindings_t        input_chan_bindings;
 gss_name_t *           src_name;
 gss_OID *              mech_type;
 gss_buffer_t           output_token;
-int *                  ret_flags;
+OM_uint32 *            ret_flags;
 OM_uint32 *            time_rec;
 gss_cred_id_t *                delegated_cred_handle;
 
similarity index 99%
rename from src/lib/gssapi/mechglue/gss_acquire_cred.c
rename to src/lib/gssapi/mechglue/g_acquire_cred.c
index 3b1c5680b2fd43d5d094cacd62565f5d7bd1fed4..111819be68bd8ca0eb15f5297605231bcf866983 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_acquire_cred(minor_status,
@@ -62,7 +62,7 @@ OM_uint32 *           time_rec;
     if (minor_status)
        *minor_status = 0;
     
-    if (desired_name == GSS_C_NO_NAME)
+    if (desired_name == 0)
        return GSS_S_BAD_NAME;
 
     /* No need to continue if we don't have a place to store the creds */
similarity index 95%
rename from src/lib/gssapi/mechglue/gss_compare_name.c
rename to src/lib/gssapi/mechglue/g_compare_name.c
index b07ace59924c13437a27a34205774377c9ace0e3..e521004ab4c5b4d2a1578d95db4ac7227314d66b 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_compare_name (minor_status,
@@ -25,7 +25,7 @@ int *                 name_equal;
     
     gss_initialize();
 
-    if (name1 == GSS_C_NO_NAME || name2 == GSS_C_NO_NAME) {
+    if (name1 == 0 || name2 == 0) {
        if (name_equal)
            *name_equal = 0;
        return GSS_S_BAD_NAME;
similarity index 97%
rename from src/lib/gssapi/mechglue/gss_context_time.c
rename to src/lib/gssapi/mechglue/g_context_time.c
index efcd5d6075164265e9e67e68987267fa545de25b..775fd04b26c952ba5b81e2e09294d87552fd1d01 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_context_time (minor_status,
similarity index 98%
rename from src/lib/gssapi/mechglue/gss_delete_sec_context.c
rename to src/lib/gssapi/mechglue/g_delete_sec_context.c
index 69866bd042722bd08ab72dcb1513014e1d1da03a..6bc3c2be62d6e0b20c2ed0d5d1afde5146957004 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_delete_sec_context (minor_status,
similarity index 95%
rename from src/lib/gssapi/mechglue/gss_display_name.c
rename to src/lib/gssapi/mechglue/g_dsp_name.c
index 4f1a27861c099adadfdf52433fcf6f759370f35a..0009efdcece1a39b638d5cea515b1b9ddf0cbc0f 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_display_name (minor_status,
@@ -28,7 +28,7 @@ gss_OID *             output_name_type;
      * to the name_type component of union_name
      */
     
-    if (input_name == GSS_C_NO_NAME)
+    if (input_name == 0)
        return GSS_S_BAD_NAME;
 
     union_name = (gss_union_name_t) input_name;
similarity index 91%
rename from src/lib/gssapi/mechglue/gss_display_status.c
rename to src/lib/gssapi/mechglue/g_dsp_status.c
index 43decb6ba68ba4f94af2052e4fc6d909a4c524b3..29542df2cdbf495676dc8f26be8a674f99feef64 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_display_status (minor_status,
@@ -17,10 +17,10 @@ gss_display_status (minor_status,
                     status_string)
 
 OM_uint32 *            minor_status;
-int                    status_value;
+OM_uint32              status_value;
 int                    status_type;
-const_gss_OID          req_mech_type;
-int *                  message_context;
+gss_OID                        req_mech_type;
+OM_uint32 *            message_context;
 gss_buffer_t           status_string;
 
 {
similarity index 96%
rename from src/lib/gssapi/mechglue/gss_import_name.c
rename to src/lib/gssapi/mechglue/g_imp_name.c
index 6ec428df23de8d1ec788f4dbe07545294b5c737d..4f22fe0e51d213d79cfd49d45bba0d2bb16a086c 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_import_name(minor_status,
@@ -16,7 +16,7 @@ gss_import_name(minor_status,
 
 OM_uint32 *            minor_status;
 gss_buffer_t           input_name_buffer;
-const_gss_OID          input_name_type;
+gss_OID                        input_name_type;
 gss_name_t *           output_name;
 
 {
similarity index 98%
rename from src/lib/gssapi/mechglue/gss_indicate_mechs.c
rename to src/lib/gssapi/mechglue/g_indicate_mechs.c
index 3b8183e10e20d67b29a4cf0cf33d7d711276426f..3071f569a78d1bbe20c1b2b4606d72a160981b35 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 extern gss_mechanism *mechs_array;
 
similarity index 94%
rename from src/lib/gssapi/mechglue/gss_init_sec_context.c
rename to src/lib/gssapi/mechglue/g_init_sec_context.c
index ed6f81fbb6a347e909f49fb2a78807e15d054429..8899386c757f99dca41ac50b9f1d6d873ecdae2b 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_init_sec_context (minor_status,
@@ -23,19 +23,19 @@ gss_init_sec_context (minor_status,
                       ret_flags,
                       time_rec)
 
-OM_uint32 *            minor_status;
+OM_uint32 FAR *                minor_status;
 gss_cred_id_t          claimant_cred_handle;
 gss_ctx_id_t *         context_handle;
 gss_name_t             target_name;
-const_gss_OID          req_mech_type;
-int                    req_flags;
-int                    time_req;
+gss_OID                        req_mech_type;
+OM_uint32              req_flags;
+OM_uint32              time_req;
 gss_channel_bindings_t input_chan_bindings;
 gss_buffer_t           input_token;
-gss_OID *              actual_mech_type;
+gss_OID FAR *          actual_mech_type;
 gss_buffer_t           output_token;
-int *                  ret_flags;
-OM_uint32 *            time_rec;
+OM_uint32 FAR *                ret_flags;
+OM_uint32 FAR *                time_rec;
 
 {
     OM_uint32          status, temp_status, temp_minor_status;
similarity index 97%
rename from src/lib/gssapi/mechglue/gss_initialize.c
rename to src/lib/gssapi/mechglue/g_initialize.c
index a6e7ed10171af1b0a7aa30f6d2cbf73bb0072d35..5081b1a2863cc11174da508a0e4094de4a885433 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 static int _gss_initialized = 0;
 
similarity index 99%
rename from src/lib/gssapi/mechglue/gss_inquire_cred.c
rename to src/lib/gssapi/mechglue/g_inquire_cred.c
index 460e8c3ae717454da51e078d5a391d2ece6a3259..9d1697aa0d9dbe549570bc21cdefe33730340456 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_inquire_cred(minor_status,
similarity index 97%
rename from src/lib/gssapi/mechglue/gss_process_context.c
rename to src/lib/gssapi/mechglue/g_process_context.c
index e44e41649d6525b65c025c637197f468adde9ad2..75ecb32c31b059b0716df959a2dc4edf93eba494 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_process_context_token (minor_status,
similarity index 96%
rename from src/lib/gssapi/mechglue/gss_release_buffer.c
rename to src/lib/gssapi/mechglue/g_rel_buffer.c
index 99ed4d5a86cfd7b33ffcbb75464950e986e90643..86a13d50694370e2b81119b563d7121f4b322285 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_release_buffer (minor_status,
similarity index 98%
rename from src/lib/gssapi/mechglue/gss_release_cred.c
rename to src/lib/gssapi/mechglue/g_rel_cred.c
index 2ef94276cb16e054fcaea9372aa8ff9e6e4dc58c..f5df0dffa034601b3dd984fc4cebf8a0828a7f6c 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_release_cred(minor_status,
similarity index 89%
rename from src/lib/gssapi/mechglue/gss_release_name.c
rename to src/lib/gssapi/mechglue/g_rel_name.c
index 87b7d312630b623512c1ac9c60f3362beb4b8946..9e288112aa57a34c7045d3cc6363581b19b93bed 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_release_name (minor_status,
@@ -20,7 +20,7 @@ gss_name_t *          input_name;
     
     /* if input_name is NULL, return error */
     
-    if(input_name == GSS_C_NO_NAME)
+    if (input_name == 0)
        return(GSS_S_BAD_NAME);
     
     /*
@@ -29,7 +29,7 @@ gss_name_t *          input_name;
      */
     
     union_name = (gss_union_name_t) *input_name;
-    *input_name = GSS_C_NO_NAME;
+    *input_name = 0;
     *minor_status = 0;
     
     if (union_name == NULL)
similarity index 96%
rename from src/lib/gssapi/mechglue/gss_release_oid_set.c
rename to src/lib/gssapi/mechglue/g_rel_oid_set.c
index 3a98df27daddf37bd157c73bee3a2da44009f82e..da1d0ed6d64f8232f6bb43906956df079f65faa3 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_release_oid_set (minor_status,
similarity index 69%
rename from src/lib/gssapi/mechglue/gss_seal.c
rename to src/lib/gssapi/mechglue/g_seal.c
index 47cb5c5c5400d042eb334098f2c9e517079d9726..0981b73edba68bccf2510186dbfece8c9bf88958 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_seal (minor_status,
@@ -62,3 +62,26 @@ gss_buffer_t         output_message_buffer;
 
     return(GSS_S_NO_CONTEXT);
 }
+
+OM_uint32
+gss_wrap (minor_status,
+          context_handle,
+          conf_req_flag,
+          qop_req,
+          input_message_buffer,
+          conf_state,
+          output_message_buffer)
+
+OM_uint32 *            minor_status;
+gss_ctx_id_t           context_handle;
+int                    conf_req_flag;
+gss_qop_t              qop_req;
+gss_buffer_t           input_message_buffer;
+int *                  conf_state;
+gss_buffer_t           output_message_buffer;
+
+{
+       return gss_seal(minor_status, context_handle, conf_req_flag,
+                       (int) qop_req, input_message_buffer, conf_state,
+                       output_message_buffer);
+}
similarity index 73%
rename from src/lib/gssapi/mechglue/gss_sign.c
rename to src/lib/gssapi/mechglue/g_sign.c
index ba00f28a73ba03cc1182398e3b77ab03c8cd1a0d..98092337db62c327f7abbfbaebe10b2a09bdd652 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_sign (minor_status,
@@ -56,3 +56,22 @@ gss_buffer_t         msg_token;
 
     return(GSS_S_NO_CONTEXT);
 }
+
+OM_uint32
+gss_get_mic (minor_status,
+          context_handle,
+          qop_req,
+          message_buffer,
+          msg_token)
+
+OM_uint32 *            minor_status;
+gss_ctx_id_t           context_handle;
+gss_qop_t              qop_req;
+gss_buffer_t           message_buffer;
+gss_buffer_t           msg_token;
+
+{
+       return (gss_sign(minor_status, context_handle, (int) qop_req,
+                        message_buffer, msg_token));
+}
+
similarity index 69%
rename from src/lib/gssapi/mechglue/gss_unseal.c
rename to src/lib/gssapi/mechglue/g_unseal.c
index 97d19a59e763c03a6ab0ed53915aeeab075d0ea0..0a1bd846b47e72dec8d9120b14ce370e503635a3 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_unseal (minor_status,
@@ -59,3 +59,25 @@ int *                        qop_state;
 
     return(GSS_S_NO_CONTEXT);
 }
+
+OM_uint32
+gss_unwrap (minor_status,
+            context_handle,
+            input_message_buffer,
+            output_message_buffer,
+            conf_state,
+            qop_state)
+
+OM_uint32 *            minor_status;
+gss_ctx_id_t           context_handle;
+gss_buffer_t           input_message_buffer;
+gss_buffer_t           output_message_buffer;
+int *                  conf_state;
+gss_qop_t *            qop_state;
+
+{
+       return (gss_unseal(minor_status, context_handle,
+                          input_message_buffer,
+                          output_message_buffer,
+                          conf_state, (int *) qop_state));
+}
similarity index 72%
rename from src/lib/gssapi/mechglue/gss_verify.c
rename to src/lib/gssapi/mechglue/g_verify.c
index 50784930b4d05effdb102a1971454dcd601ec586..1a5c149a7811fe1b12aceda5cb2b89c6960cdaa9 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32
 gss_verify (minor_status,
@@ -56,3 +56,21 @@ int *                        qop_state;
 
     return(GSS_S_NO_CONTEXT);
 }
+
+OM_uint32
+gss_verify_misc (minor_status,
+            context_handle,
+            message_buffer,
+            token_buffer,
+            qop_state)
+
+OM_uint32 *            minor_status;
+gss_ctx_id_t           context_handle;
+gss_buffer_t           message_buffer;
+gss_buffer_t           token_buffer;
+gss_qop_t *            qop_state;
+
+{
+       return (gss_verify(minor_status, context_handle,
+                          message_buffer, token_buffer, (int *) qop_state));
+}
index b3f7b690080eb6c7362529edac114f5f530f5df0..b72020da209c4aa00c8d17b0486806d1c85aea2c 100644 (file)
@@ -9,11 +9,11 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 extern gss_mechanism *mechs_array;
 
-gss_mechanism get_mechanism (const_gss_OID type)
+gss_mechanism get_mechanism (gss_OID type)
 {
     int        i;
 
similarity index 98%
rename from src/lib/gssapi/mechglue/get_mech_type.c
rename to src/lib/gssapi/mechglue/get_mtype.c
index 0dc087512a6af26a52866cf5ecca26f5f9bc8fad..6ac9b5db846103bb5132e8a198d098e50449fc55 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32 get_mech_type(OID, token)
 
index da0da92c78d97b2af0c388aab226a5936ea2a9e3..e99e85f2034b6d3d9f57b2626c15af92dc3b895f 100644 (file)
@@ -9,7 +9,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 int gssd_pname_to_uid(pname, name_type, mech_type, uid)
 
index 0fba73fdb46e6bccb58144543929408466e34010..7657a2b34304609b48268ba68dd9796725d7602c 100644 (file)
@@ -6,7 +6,7 @@
  * All rights reserved.
  */
 
-#include "mechglueP.h"
+#include "mglueP.h"
 
 OM_uint32 import_internal_name (minor_status, mech_type, union_name, 
                                internal_name)
similarity index 82%
rename from src/lib/gssapi/mechglue/mechglueP.h
rename to src/lib/gssapi/mechglue/mglueP.h
index 34f007f28793a171290f3da59a7d43094d0e746e..a322f65c1af3ee20ed01497df007b87160d691f8 100644 (file)
@@ -90,7 +90,7 @@ typedef struct gss_config {
         gss_cred_id_t,         /* claimant_cred_handle */
         gss_ctx_id_t*,         /* context_handle */
         gss_name_t,            /* target_name */
-        const_gss_OID,         /* mech_type */
+        gss_OID,               /* mech_type */
         int,                   /* req_flags */
         OM_uint32,             /* time_req */
         gss_channel_bindings_t, /* input_chan_bindings */
@@ -172,7 +172,7 @@ typedef struct gss_config {
         OM_uint32*,            /* minor_status */
         OM_uint32,             /* status_value */
         int,                   /* status_type */
-        const_gss_OID,         /* mech_type */
+        gss_OID,               /* mech_type */
         int*,                  /* message_context */
         gss_buffer_t           /* status_string */
         );
@@ -199,7 +199,7 @@ typedef struct gss_config {
        (void*,                 /* context */
         OM_uint32*,            /* minor_status */
         gss_buffer_t,          /* input_name_buffer */
-        const_gss_OID,         /* input_name_type */
+        gss_OID,               /* input_name_type */
         gss_name_t*            /* output_name */
         );
     OM_uint32       (*gss_release_name)
@@ -216,6 +216,49 @@ typedef struct gss_config {
         int *,                 /* cred_usage */
         gss_OID_set *          /* mechanisms */
         );
+    OM_uint32      (*gss_add_cred)
+       (void*,                 /* context */
+        OM_uint32 *,           /* minor_status */
+        gss_cred_id_t,         /* input_cred_handle */
+        gss_name_t,            /* desired_name */
+        gss_OID,               /* desired_mech */
+        gss_cred_usage_t,      /* cred_usage */
+        OM_uint32,             /* initiator_time_req */
+        OM_uint32,             /* acceptor_time_req */
+        gss_cred_id_t *,       /* output_cred_handle */
+        gss_OID_set *,         /* actual_mechs */
+        OM_uint32 *,           /* initiator_time_rec */
+        OM_uint32 *            /* acceptor_time_rec */
+        );
+    OM_uint32      (*gss_export_sec_context)
+       (void*,                 /* context */
+        OM_uint32 *,           /* minor_status */
+        gss_ctx_id_t *,        /* context_handle */
+        gss_buffer_t           /* interprocess_token */
+        );
+    OM_uint32      (*gss_import_sec_context)
+       (void *,                /* context */
+        OM_uint32 *,           /* minor_status */
+        gss_buffer_t,          /* interprocess_token */
+        gss_ctx_id_t *         /* context_handle */
+        );
+    OM_uint32      (*gss_inquire_cred_by_mech)
+       (void *,                /* context */
+        OM_uint32 *,           /* minor_status */
+        gss_cred_id_t,         /* cred_handle */
+        gss_OID,               /* mech_type */
+        gss_name_t *,          /* name */
+        OM_uint32 *,           /* initiator_lifetime */
+        OM_uint32 *,           /* acceptor_lifetime */
+        gss_cred_usage_t *     /* cred_usage */
+        );
+
+    OM_uint32      (*gss_inquire_names_for_mech)
+       (void *,                /* context */
+        OM_uint32 *,           /* minor_status */
+        gss_OID,               /* mechanism */
+        gss_OID_set *          /* name_types */
+        );
     int                     (*pname_to_uid)
        (char *,                /* pname */
         gss_OID,               /* name type */
@@ -227,7 +270,7 @@ typedef struct gss_config {
 /********************************************************/
 /* Internal mechglue routines */
 
-gss_mechanism get_mechanism (const_gss_OID);
+gss_mechanism get_mechanism (gss_OID);
 OM_uint32 add_mechanism (gss_mechanism, int);
 OM_uint32 get_mech_type(gss_OID *, gss_buffer_t);
 OM_uint32 import_internal_name (OM_uint32 *, gss_OID, gss_union_name_t,