s3-auth rename auth_ntlmssp_state -> auth_generic_state

[mat/samba.git] / source3 / libsmb / ntlmssp_wrap.c

diff --git a/source3/libsmb/ntlmssp_wrap.c b/source3/libsmb/ntlmssp_wrap.c
index 3d1d099a586cca324b073beb97a76d8d5d8a61ab..de3d0a1bf28e1db09100771e86a048dabad5f3c9 100644 (file)
--- a/source3/libsmb/ntlmssp_wrap.c
+++ b/source3/libsmb/ntlmssp_wrap.c
@@ -26,114 +26,27 @@
 #include "librpc/rpc/dcerpc.h"
 #include "lib/param/param.h"
 
-NTSTATUS auth_ntlmssp_sign_packet(struct auth_ntlmssp_state *ans,
-                                 TALLOC_CTX *sig_mem_ctx,
-                                 const uint8_t *data,
-                                 size_t length,
-                                 const uint8_t *whole_pdu,
-                                 size_t pdu_length,
-                                 DATA_BLOB *sig)
-{
-       return gensec_sign_packet(ans->gensec_security,
-                                 sig_mem_ctx, data, length, whole_pdu, pdu_length, sig);
-}
-
-NTSTATUS auth_ntlmssp_check_packet(struct auth_ntlmssp_state *ans,
-                                  const uint8_t *data,
-                                  size_t length,
-                                  const uint8_t *whole_pdu,
-                                  size_t pdu_length,
-                                  const DATA_BLOB *sig)
-{
-       return gensec_check_packet(ans->gensec_security,
-                                  data, length, whole_pdu, pdu_length, sig);
-}
-
-NTSTATUS auth_ntlmssp_seal_packet(struct auth_ntlmssp_state *ans,
-                                 TALLOC_CTX *sig_mem_ctx,
-                                 uint8_t *data,
-                                 size_t length,
-                                 const uint8_t *whole_pdu,
-                                 size_t pdu_length,
-                                 DATA_BLOB *sig)
-{
-       return gensec_seal_packet(ans->gensec_security,
-                                 sig_mem_ctx, data, length, whole_pdu, pdu_length, sig);
-}
-
-NTSTATUS auth_ntlmssp_unseal_packet(struct auth_ntlmssp_state *ans,
-                                   uint8_t *data,
-                                   size_t length,
-                                   const uint8_t *whole_pdu,
-                                   size_t pdu_length,
-                                   const DATA_BLOB *sig)
-{
-       return gensec_unseal_packet(ans->gensec_security,
-                                   data, length, whole_pdu, pdu_length, sig);
-}
-
-bool auth_ntlmssp_negotiated_sign(struct auth_ntlmssp_state *ans)
-{
-       return gensec_have_feature(ans->gensec_security, GENSEC_FEATURE_SIGN);
-}
-
-bool auth_ntlmssp_negotiated_seal(struct auth_ntlmssp_state *ans)
-{
-       return gensec_have_feature(ans->gensec_security, GENSEC_FEATURE_SEAL);
-}
-
-NTSTATUS auth_ntlmssp_set_username(struct auth_ntlmssp_state *ans,
+NTSTATUS auth_ntlmssp_set_username(struct auth_generic_state *ans,
                                   const char *user)
 {
        cli_credentials_set_username(ans->credentials, user, CRED_SPECIFIED);
        return NT_STATUS_OK;
 }
 
-NTSTATUS auth_ntlmssp_set_domain(struct auth_ntlmssp_state *ans,
+NTSTATUS auth_ntlmssp_set_domain(struct auth_generic_state *ans,
                                 const char *domain)
 {
        cli_credentials_set_domain(ans->credentials, domain, CRED_SPECIFIED);
        return NT_STATUS_OK;
 }
 
-NTSTATUS auth_ntlmssp_set_password(struct auth_ntlmssp_state *ans,
+NTSTATUS auth_ntlmssp_set_password(struct auth_generic_state *ans,
                                   const char *password)
 {
        cli_credentials_set_password(ans->credentials, password, CRED_SPECIFIED);
        return NT_STATUS_OK;
 }
 
-void auth_ntlmssp_want_feature(struct auth_ntlmssp_state *ans, uint32_t feature)
-{
-       if (feature & NTLMSSP_FEATURE_SESSION_KEY) {
-               gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SESSION_KEY);
-       }
-       if (feature & NTLMSSP_FEATURE_SIGN) {
-               gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SIGN);
-       }
-       if (feature & NTLMSSP_FEATURE_SEAL) {
-               gensec_want_feature(ans->gensec_security, GENSEC_FEATURE_SEAL);
-       }
-}
-
-DATA_BLOB auth_ntlmssp_get_session_key(struct auth_ntlmssp_state *ans, TALLOC_CTX *mem_ctx)
-{
-       DATA_BLOB session_key;
-       NTSTATUS status = gensec_session_key(ans->gensec_security, mem_ctx, &session_key);
-       if (NT_STATUS_IS_OK(status)) {
-               return session_key;
-       } else {
-               return data_blob_null;
-       }
-}
-
-NTSTATUS auth_ntlmssp_update(struct auth_ntlmssp_state *ans,
-                            TALLOC_CTX *mem_ctx,
-                            const DATA_BLOB request, DATA_BLOB *reply)
-{
-       return gensec_update(ans->gensec_security, mem_ctx, NULL, request, reply);
-}
-
 static NTSTATUS gensec_ntlmssp3_client_update(struct gensec_security *gensec_security,
                                              TALLOC_CTX *out_mem_ctx,
                                              struct tevent_context *ev,
@@ -240,15 +153,15 @@ static const struct gensec_security_ops gensec_ntlmssp3_client_ops = {
        .priority       = GENSEC_NTLMSSP
 };
 
-NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, struct auth_ntlmssp_state **auth_ntlmssp_state)
+NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_state **auth_ntlmssp_state)
 {
-       struct auth_ntlmssp_state *ans;
+       struct auth_generic_state *ans;
        NTSTATUS nt_status;
 
        struct gensec_settings *gensec_settings;
        struct loadparm_context *lp_ctx;
 
-       ans = talloc_zero(mem_ctx, struct auth_ntlmssp_state);
+       ans = talloc_zero(mem_ctx, struct auth_generic_state);
        if (!ans) {
                DEBUG(0,("auth_ntlmssp_start: talloc failed!\n"));
                return NT_STATUS_NO_MEMORY;
@@ -290,7 +203,7 @@ NTSTATUS auth_ntlmssp_client_prepare(TALLOC_CTX *mem_ctx, struct auth_ntlmssp_st
        return NT_STATUS_OK;
 }
 
-NTSTATUS auth_ntlmssp_client_start(struct auth_ntlmssp_state *ans)
+NTSTATUS auth_ntlmssp_client_start(struct auth_generic_state *ans)
 {
        NTSTATUS status;