gsskrb5: add [un]wrap_ex for arcfour-hmac-md5

[metze/samba/wip.git] / source / heimdal / lib / gssapi / krb5 / gsskrb5-private.h

diff --git a/source/heimdal/lib/gssapi/krb5/gsskrb5-private.h b/source/heimdal/lib/gssapi/krb5/gsskrb5-private.h
index 15bd5c77daea48aa041cd304f14f0022fca1c8a7..08a65b10df077eb04ff212c25bcfebcb3d0e05aa 100644 (file)
--- a/source/heimdal/lib/gssapi/krb5/gsskrb5-private.h
+++ b/source/heimdal/lib/gssapi/krb5/gsskrb5-private.h
@@ -110,6 +110,17 @@ _gssapi_unwrap_arcfour (
        gss_qop_t */*qop_state*/,
        krb5_keyblock */*key*/);
 
+OM_uint32
+_gssapi_unwrap_ex_arcfour(OM_uint32 *minor_status,
+                               const gsskrb5_ctx context_handle,
+                               krb5_context context,
+                               int *conf_state,
+                               gss_qop_t *qop_state,
+                               krb5_keyblock *key,
+                               const gss_buffer_t token_header_buffer,
+                               const gss_buffer_t associated_data_buffer,
+                               gss_buffer_t message_buffer);
+
 OM_uint32
 _gssapi_unwrap_cfx (
        OM_uint32 */*minor_status*/,
@@ -166,6 +177,18 @@ _gssapi_wrap_arcfour (
        gss_buffer_t /*output_message_buffer*/,
        krb5_keyblock */*key*/);
 
+OM_uint32
+_gssapi_wrap_ex_arcfour(OM_uint32 *minor_status,
+                             const gsskrb5_ctx context_handle,
+                             krb5_context context,
+                             int conf_req_flag,
+                             gss_qop_t qop_req,
+                             int *conf_state,
+                             krb5_keyblock *key,
+                             const gss_buffer_t associated_data_buffer,
+                             gss_buffer_t message_buffer,
+                             gss_buffer_t output_token_buffer);
+
 OM_uint32
 _gssapi_wrap_cfx (
        OM_uint32 */*minor_status*/,
@@ -239,12 +262,6 @@ _gsskrb5_add_cred (
        OM_uint32 */*initiator_time_rec*/,
        OM_uint32 */*acceptor_time_rec*/);
 
-OM_uint32
-_gsskrb5_add_oid_set_member (
-        OM_uint32 * /*minor_status*/,
-       const gss_OID /*member_oid*/,
-       gss_OID_set * oid_set );
-
 OM_uint32
 _gsskrb5_canonicalize_name (
         OM_uint32 * /*minor_status*/,
@@ -284,11 +301,6 @@ _gsskrb5_create_ctx (
        const gss_channel_bindings_t /*input_chan_bindings*/,
        enum gss_ctx_id_t_state /*state*/);
 
-OM_uint32
-_gsskrb5_create_empty_oid_set (
-        OM_uint32 * /*minor_status*/,
-       gss_OID_set * oid_set );
-
 OM_uint32
 _gsskrb5_decapsulate (
        OM_uint32 */*minor_status*/,
@@ -424,7 +436,7 @@ _gsskrb5_init (krb5_context */*context*/);
 OM_uint32
 _gsskrb5_init_sec_context (
        OM_uint32 * /*minor_status*/,
-       const gss_cred_id_t /*initiator_cred_handle*/,
+       const gss_cred_id_t /*cred_handle*/,
        gss_ctx_id_t * /*context_handle*/,
        const gss_name_t /*target_name*/,
        const gss_OID /*mech_type*/,
@@ -520,6 +532,15 @@ _gsskrb5_process_context_token (
        const gss_ctx_id_t /*context_handle*/,
        const gss_buffer_t token_buffer );
 
+OM_uint32
+_gsskrb5_pseudo_random (
+       OM_uint32 */*minor_status*/,
+       gss_ctx_id_t /*context_handle*/,
+       int /*prf_key*/,
+       const gss_buffer_t /*prf_in*/,
+       ssize_t /*desired_output_len*/,
+       gss_buffer_t /*prf_out*/);
+
 OM_uint32
 _gsskrb5_register_acceptor_identity (const char */*identity*/);
 
@@ -538,11 +559,6 @@ _gsskrb5_release_name (
        OM_uint32 * /*minor_status*/,
        gss_name_t * input_name );
 
-OM_uint32
-_gsskrb5_release_oid_set (
-       OM_uint32 * /*minor_status*/,
-       gss_OID_set * set );
-
 OM_uint32
 _gsskrb5_seal (
        OM_uint32 * /*minor_status*/,
@@ -580,13 +596,6 @@ _gsskrb5_sign (
        gss_buffer_t /*message_buffer*/,
        gss_buffer_t message_token );
 
-OM_uint32
-_gsskrb5_test_oid_set_member (
-       OM_uint32 * /*minor_status*/,
-       const gss_OID /*member*/,
-       const gss_OID_set /*set*/,
-       int * present );
-
 OM_uint32
 _gsskrb5_unseal (
        OM_uint32 * /*minor_status*/,
@@ -605,6 +614,16 @@ _gsskrb5_unwrap (
        int * /*conf_state*/,
        gss_qop_t * qop_state );
 
+OM_uint32
+_gsskrb5_unwrap_ex (
+       OM_uint32 * /*minor_status*/,
+       const gss_ctx_id_t /*context_handle*/,
+       const gss_buffer_t /*token_header_buffer*/,
+       const gss_buffer_t /*associated_data_buffer*/,
+       gss_buffer_t /*message_buffer*/,
+       int * /*conf_state*/,
+       gss_qop_t * qop_state );
+
 OM_uint32
 _gsskrb5_verify (
        OM_uint32 * /*minor_status*/,
@@ -656,6 +675,16 @@ _gsskrb5_wrap (
        int * /*conf_state*/,
        gss_buffer_t output_message_buffer );
 
+OM_uint32 _gsskrb5_wrap_ex (
+       OM_uint32 * /*minor_status*/,
+       const gss_ctx_id_t /*context_handle*/,
+       int /*conf_req_flag*/,
+       gss_qop_t /*qop_req*/,
+       const gss_buffer_t /*associated_data_buffer*/,
+       gss_buffer_t /*message_buffer*/,
+       gss_buffer_t /*output_token_buffer*/,
+       int * conf_state );
+
 OM_uint32
 _gsskrb5_wrap_size_limit (
         OM_uint32 * /*minor_status*/,
@@ -675,6 +704,7 @@ _gsskrb5cfx_max_wrap_length_cfx (
 
 krb5_error_code
 _gsskrb5cfx_wrap_length_cfx (
+       const gsskrb5_ctx /*context_handle*/,
        krb5_context /*context*/,
        krb5_crypto /*crypto*/,
        int /*conf_req_flag*/,