s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[gd/samba-autobuild/.git] / source4 / torture / auth / ntlmssp.c

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index 739a048d29a790a8ce5c50b6c168e47fba0fd493..d7639ac9cff22ef3cc117088078c01813263ffcd 100644 (file)
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -19,22 +19,23 @@
 
 #include "includes.h"
 #include "auth/gensec/gensec.h"
-#include "auth/gensec/gensec_proto.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/torture.h"
+#include "param/param.h"
 
 static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 {
        struct gensec_security *gensec_security;
-       struct gensec_ntlmssp_state *gensec_ntlmssp_state;
+       struct gensec_ntlmssp_context *gensec_ntlmssp;
+       struct ntlmssp_state *ntlmssp_state;
        DATA_BLOB data;
        DATA_BLOB sig, expected_sig;
        TALLOC_CTX *mem_ctx = tctx;
 
        torture_assert_ntstatus_ok(tctx, 
                gensec_client_start(mem_ctx, &gensec_security,
-                                   tctx->ev, tctx->lp_ctx),
+                                   tctx->ev, lpcfg_gensec_settings(tctx, tctx->lp_ctx)),
                "gensec client start");
 
        gensec_set_credentials(gensec_security, cmdline_credentials);
@@ -46,24 +47,26 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
                        gensec_start_mech_by_oid(gensec_security, GENSEC_OID_NTLMSSP),
                        "Failed to start GENSEC for NTLMSSP");
 
-       gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
+       gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data,
+                                              struct gensec_ntlmssp_context);
+       ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
 
-       gensec_ntlmssp_state->session_key = strhex_to_data_blob("0102030405060708090a0b0c0d0e0f00");
+       ntlmssp_state->session_key = strhex_to_data_blob(tctx, "0102030405060708090a0b0c0d0e0f00");
        dump_data_pw("NTLMSSP session key: \n", 
-                    gensec_ntlmssp_state->session_key.data,  
-                    gensec_ntlmssp_state->session_key.length);
+                    ntlmssp_state->session_key.data,
+                    ntlmssp_state->session_key.length);
 
-       gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_KEY_EXCH | NTLMSSP_NEGOTIATE_NTLM2;
+       ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_KEY_EXCH | NTLMSSP_NEGOTIATE_NTLM2;
 
        torture_assert_ntstatus_ok(tctx,  
-               ntlmssp_sign_init(gensec_ntlmssp_state),
+               ntlmssp_sign_init(ntlmssp_state),
                "Failed to sign_init");
 
-       data = strhex_to_data_blob("6a43494653");
+       data = strhex_to_data_blob(tctx, "6a43494653");
        gensec_ntlmssp_sign_packet(gensec_security, gensec_security,
                                   data.data, data.length, data.data, data.length, &sig);
 
-       expected_sig = strhex_to_data_blob("01000000e37f97f2544f4d7e00000000");
+       expected_sig = strhex_to_data_blob(tctx, "01000000e37f97f2544f4d7e00000000");
 
        dump_data_pw("NTLMSSP calc sig:     ", sig.data, sig.length);
        dump_data_pw("NTLMSSP expected sig: ", expected_sig.data, expected_sig.length);
@@ -78,7 +81,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
                                                                  data.data, data.length, data.data, data.length, &sig),
                                      NT_STATUS_ACCESS_DENIED, "Check of just signed packet (should fail, wrong end)");
 
-       gensec_ntlmssp_state->session_key = data_blob(NULL, 0);
+       ntlmssp_state->session_key = data_blob(NULL, 0);
 
        torture_assert_ntstatus_equal(tctx, 
                                      gensec_ntlmssp_check_packet(gensec_security, gensec_security,
@@ -89,7 +92,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 
        torture_assert_ntstatus_ok(tctx, 
                gensec_client_start(mem_ctx, &gensec_security,
-                                   tctx->ev, tctx->lp_ctx),
+                                   tctx->ev, lpcfg_gensec_settings(tctx, tctx->lp_ctx)),
                "Failed to start GENSEC for NTLMSSP");
 
        gensec_set_credentials(gensec_security, cmdline_credentials);
@@ -101,24 +104,26 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
                gensec_start_mech_by_oid(gensec_security, GENSEC_OID_NTLMSSP),
                "GENSEC start mech by oid");
 
-       gensec_ntlmssp_state = (struct gensec_ntlmssp_state *)gensec_security->private_data;
+       gensec_ntlmssp = talloc_get_type_abort(gensec_security->private_data,
+                                              struct gensec_ntlmssp_context);
+       ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
 
-       gensec_ntlmssp_state->session_key = strhex_to_data_blob("0102030405e538b0");
+       ntlmssp_state->session_key = strhex_to_data_blob(tctx, "0102030405e538b0");
        dump_data_pw("NTLMSSP session key: \n", 
-                    gensec_ntlmssp_state->session_key.data,  
-                    gensec_ntlmssp_state->session_key.length);
+                    ntlmssp_state->session_key.data,
+                    ntlmssp_state->session_key.length);
 
-       gensec_ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_KEY_EXCH;
+       ntlmssp_state->neg_flags = NTLMSSP_NEGOTIATE_SIGN | NTLMSSP_NEGOTIATE_UNICODE | NTLMSSP_NEGOTIATE_KEY_EXCH;
 
        torture_assert_ntstatus_ok(tctx,  
-               ntlmssp_sign_init(gensec_ntlmssp_state),
+               ntlmssp_sign_init(ntlmssp_state),
                "Failed to sign_init");
 
-       data = strhex_to_data_blob("6a43494653");
+       data = strhex_to_data_blob(tctx, "6a43494653");
        gensec_ntlmssp_sign_packet(gensec_security, gensec_security,
                            data.data, data.length, data.data, data.length, &sig);
 
-       expected_sig = strhex_to_data_blob("0100000078010900397420fe0e5a0f89");
+       expected_sig = strhex_to_data_blob(tctx, "0100000078010900397420fe0e5a0f89");
 
        dump_data_pw("NTLMSSP calc sig:     ", sig.data, sig.length);
        dump_data_pw("NTLMSSP expected sig: ", expected_sig.data, expected_sig.length);