s3-ntlmssp Remove rpccli_get_pwd_hash and auth_ntlmssp_get_nt_hash

[metze/samba/wip.git] / source3 / rpc_client / cli_pipe.c

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 0b9470620d90259dd9e521247335c5f941cd963e..80e3c4b1ae9c4f6b0ba5bf8724e72a9989121202 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -33,7 +33,7 @@
 #include "librpc/crypto/spnego.h"
 #include "rpc_dce.h"
 #include "cli_pipe.h"
-#include "client.h"
+#include "libsmb/libsmb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_CLI
@@ -1037,6 +1037,7 @@ static NTSTATUS create_gssapi_auth_bind_req(TALLOC_CTX *mem_ctx,
  ********************************************************************/
 
 static NTSTATUS create_ntlmssp_auth_rpc_bind_req(struct rpc_pipe_client *cli,
+                                                TALLOC_CTX *mem_ctx,
                                                 DATA_BLOB *auth_token)
 {
        struct auth_ntlmssp_state *ntlmssp_ctx;
@@ -1047,7 +1048,7 @@ static NTSTATUS create_ntlmssp_auth_rpc_bind_req(struct rpc_pipe_client *cli,
                                            struct auth_ntlmssp_state);
 
        DEBUG(5, ("create_ntlmssp_auth_rpc_bind_req: Processing NTLMSSP Negotiate\n"));
-       status = auth_ntlmssp_update(ntlmssp_ctx, null_blob, auth_token);
+       status = auth_ntlmssp_update(ntlmssp_ctx, mem_ctx, null_blob, auth_token);
 
        if (!NT_STATUS_EQUAL(status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                data_blob_free(auth_token);
@@ -1171,7 +1172,7 @@ static NTSTATUS create_rpc_bind_req(TALLOC_CTX *mem_ctx,
                break;
 
        case DCERPC_AUTH_TYPE_NTLMSSP:
-               ret = create_ntlmssp_auth_rpc_bind_req(cli, &auth_token);
+               ret = create_ntlmssp_auth_rpc_bind_req(cli, mem_ctx, &auth_token);
                if (!NT_STATUS_IS_OK(ret)) {
                        return ret;
                }
@@ -1772,7 +1773,7 @@ static void rpc_pipe_bind_step_one_done(struct tevent_req *subreq)
        case DCERPC_AUTH_TYPE_NTLMSSP:
                ntlmssp_ctx = talloc_get_type_abort(pauth->auth_ctx,
                                                    struct auth_ntlmssp_state);
-               status = auth_ntlmssp_update(ntlmssp_ctx,
+               status = auth_ntlmssp_update(ntlmssp_ctx, state,
                                             auth.credentials, &auth_token);
                if (NT_STATUS_EQUAL(status,
                                    NT_STATUS_MORE_PROCESSING_REQUIRED)) {
@@ -2207,47 +2208,6 @@ struct dcerpc_binding_handle *rpccli_bh_create(struct rpc_pipe_client *c)
        return h;
 }
 
-bool rpccli_get_pwd_hash(struct rpc_pipe_client *rpc_cli, uint8_t nt_hash[16])
-{
-       struct auth_ntlmssp_state *a = NULL;
-       struct cli_state *cli;
-
-       if (rpc_cli->auth->auth_type == DCERPC_AUTH_TYPE_NTLMSSP) {
-               a = talloc_get_type_abort(rpc_cli->auth->auth_ctx,
-                                         struct auth_ntlmssp_state);
-       } else if (rpc_cli->auth->auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
-               struct spnego_context *spnego_ctx;
-               enum spnego_mech auth_type;
-               void *auth_ctx;
-               NTSTATUS status;
-
-               spnego_ctx = talloc_get_type_abort(rpc_cli->auth->auth_ctx,
-                                                  struct spnego_context);
-               status = spnego_get_negotiated_mech(spnego_ctx,
-                                                   &auth_type, &auth_ctx);
-               if (!NT_STATUS_IS_OK(status)) {
-                       return false;
-               }
-
-               if (auth_type == SPNEGO_NTLMSSP) {
-                       a = talloc_get_type_abort(auth_ctx,
-                                                 struct auth_ntlmssp_state);
-               }
-       }
-
-       if (a) {
-               memcpy(nt_hash, auth_ntlmssp_get_nt_hash(a), 16);
-               return true;
-       }
-
-       cli = rpc_pipe_np_smb_conn(rpc_cli);
-       if (cli == NULL) {
-               return false;
-       }
-       E_md4hash(cli->password ? cli->password : "", nt_hash);
-       return true;
-}
-
 NTSTATUS rpccli_ncalrpc_bind_data(TALLOC_CTX *mem_ctx,
                                  struct pipe_auth_data **presult)
 {
@@ -2362,10 +2322,9 @@ static NTSTATUS rpccli_ntlmssp_bind_data(TALLOC_CTX *mem_ctx,
                                                NTLMSSP_NEGOTIATE_SEAL));
 
        if (auth_level == DCERPC_AUTH_LEVEL_INTEGRITY) {
-               auth_ntlmssp_or_flags(ntlmssp_ctx, NTLMSSP_NEGOTIATE_SIGN);
+               auth_ntlmssp_want_feature(ntlmssp_ctx, NTLMSSP_FEATURE_SIGN);
        } else if (auth_level == DCERPC_AUTH_LEVEL_PRIVACY) {
-               auth_ntlmssp_or_flags(ntlmssp_ctx, NTLMSSP_NEGOTIATE_SEAL |
-                                                    NTLMSSP_NEGOTIATE_SIGN);
+               auth_ntlmssp_want_feature(ntlmssp_ctx, NTLMSSP_FEATURE_SEAL);
        }
 
        result->auth_ctx = ntlmssp_ctx;
@@ -2763,7 +2722,7 @@ static NTSTATUS rpc_pipe_open_np(struct cli_state *cli,
 
        result->abstract_syntax = *abstract_syntax;
        result->transfer_syntax = ndr_transfer_syntax;
-       result->desthost = talloc_strdup(result, cli->desthost);
+       result->desthost = talloc_strdup(result, cli_state_remote_name(cli));
        result->srv_name_slash = talloc_asprintf_strupper_m(
                result, "\\\\%s", result->desthost);
 
@@ -2816,8 +2775,8 @@ static NTSTATUS cli_rpc_pipe_open(struct cli_state *cli,
 {
        switch (transport) {
        case NCACN_IP_TCP:
-               return rpc_pipe_open_tcp(NULL, cli->desthost, interface,
-                                        presult);
+               return rpc_pipe_open_tcp(NULL, cli_state_remote_name(cli),
+                                        interface, presult);
        case NCACN_NP:
                return rpc_pipe_open_np(cli, interface, presult);
        default:
@@ -2891,7 +2850,7 @@ NTSTATUS cli_rpc_pipe_open_noauth_transport(struct cli_state *cli,
        DEBUG(10,("cli_rpc_pipe_open_noauth: opened pipe %s to machine "
                  "%s and bound anonymously.\n",
                  get_pipe_name_from_syntax(talloc_tos(), interface),
-                 cli->desthost));
+                 result->desthost));
 
        *presult = result;
        return NT_STATUS_OK;
@@ -2951,7 +2910,7 @@ NTSTATUS cli_rpc_pipe_open_ntlmssp(struct cli_state *cli,
        DEBUG(10,("cli_rpc_pipe_open_ntlmssp_internal: opened pipe %s to "
                "machine %s and bound NTLMSSP as user %s\\%s.\n",
                  get_pipe_name_from_syntax(talloc_tos(), interface),
-                 cli->desthost, domain, username ));
+                 result->desthost, domain, username));
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3018,7 +2977,7 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
        DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
                  "for domain %s and bound using schannel.\n",
                  get_pipe_name_from_syntax(talloc_tos(), interface),
-                 cli->desthost, domain ));
+                 result->desthost, domain));
 
        *presult = result;
        return NT_STATUS_OK;
@@ -3287,8 +3246,8 @@ NTSTATUS cli_get_session_key(TALLOC_CTX *mem_ctx,
        case DCERPC_AUTH_TYPE_NTLMSSP:
                ntlmssp_ctx = talloc_get_type_abort(a->auth_ctx,
                                                    struct auth_ntlmssp_state);
-               sk = auth_ntlmssp_get_session_key(ntlmssp_ctx);
-               make_dup = true;
+               sk = auth_ntlmssp_get_session_key(ntlmssp_ctx, mem_ctx);
+               make_dup = false;
                break;
        case DCERPC_AUTH_TYPE_KRB5:
                gse_ctx = talloc_get_type_abort(a->auth_ctx,