Conf file is now in source tree

[mod_auth_kerb.cvs/.git] / spnegokrb5 / encapsulate.c

diff --git a/spnegokrb5/encapsulate.c b/spnegokrb5/encapsulate.c
index 2fc95f4..f64c451 100644 (file)
--- a/spnegokrb5/encapsulate.c
+++ b/spnegokrb5/encapsulate.c
@@ -33,28 +33,25 @@
 
 #include "spnegokrb5_locl.h"
 
-void
-gssapi_spnego_encap_length (size_t data_len,
-                           size_t *len,
-                           size_t *total_len)
+static void
+gssapi_encap_length (size_t data_len,
+                    size_t *len,
+                    size_t *total_len,
+                    const gss_OID mech)
 {
     size_t len_len;
 
-#if 0
-    *len = 1 + 1 + GSS_SPNEGO_MECH->length + 2 + data_len;
-#else
-    *len = 1 + 1 + GSS_SPNEGO_MECH->length + data_len;
-#endif
+    *len = 1 + 1 + mech->length + data_len;
 
     len_len = length_len(*len);
 
     *total_len = 1 + len_len + *len;
 }
 
-u_char *
-gssapi_spnego_make_header (u_char *p,
-                          size_t len,
-                          u_char *type)
+static u_char *
+gssapi_mech_make_header (u_char *p,
+                        size_t len,
+                        const gss_OID mech)
 {
     int e;
     size_t len_len, foo;
@@ -66,13 +63,9 @@ gssapi_spnego_make_header (u_char *p,
        abort ();
     p += len_len;
     *p++ = 0x06;
-    *p++ = GSS_SPNEGO_MECH->length;
-    memcpy (p, GSS_SPNEGO_MECH->elements, GSS_SPNEGO_MECH->length);
-    p += GSS_SPNEGO_MECH->length;
-#if 0
-    memcpy (p, type, 2);
-    p += 2;
-#endif
+    *p++ = mech->length;
+    memcpy (p, mech->elements, mech->length);
+    p += mech->length;
     return p;
 }
 
@@ -86,13 +79,13 @@ gssapi_spnego_encapsulate(
                        unsigned char *buf,
                        size_t buf_size,
                        gss_buffer_t output_token,
-                       u_char *type
+                       const gss_OID mech
 )
 {
     size_t len, outer_len;
     u_char *p;
 
-    gssapi_spnego_encap_length (buf_size, &len, &outer_len);
+    gssapi_encap_length (buf_size, &len, &outer_len, mech);
     
     output_token->length = outer_len;
     output_token->value  = malloc (outer_len);
@@ -101,7 +94,7 @@ gssapi_spnego_encapsulate(
        return GSS_S_FAILURE;
     }  
 
-    p = gssapi_spnego_make_header (output_token->value, len, type);
+    p = gssapi_mech_make_header (output_token->value, len, mech);
     memcpy (p, buf, buf_size);
     return GSS_S_COMPLETE;
 }