s4-torture: cleanup torture_suite_add_ndr_pull_validate_test API.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Wed Sep  7 09:28:13 CEST 2016 on sn-devel-144

8 files changed, 38 insertions, 42 deletions

diff --git a/source4/torture/ndr/backupkey.c b/source4/torture/ndr/backupkey.c
index abf34ac925e..1be92297c78 100644
--- a/source4/torture/ndr/backupkey.c
+++ b/source4/torture/ndr/backupkey.c
@@ -156,8 +156,7 @@ struct torture_suite *ndr_backupkey_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    bkrp_exported_RSA_key_pair,
-					    data_blob_const(exported_rsa_ndr,
-							    sizeof(exported_rsa_ndr)),
+					    exported_rsa_ndr,
 					    NULL);
 
 	return suite;
diff --git a/source4/torture/ndr/clusapi.c b/source4/torture/ndr/clusapi.c
index 3fe84db5ace..cf2ac67873e 100644
--- a/source4/torture/ndr/clusapi.c
+++ b/source4/torture/ndr/clusapi.c
@@ -371,12 +371,12 @@ struct torture_suite *ndr_clusapi_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    clusapi_PROPERTY_LIST,
-					    data_blob_const(clusapi_PROPERTY_LIST_data,sizeof(clusapi_PROPERTY_LIST_data)),
+					    clusapi_PROPERTY_LIST_data,
 					    clusapi_PROPERTY_LIST_check);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    clusapi_PROPERTY_LIST,
-					    data_blob_const(clusapi_PROPERTY_LIST_data2,sizeof(clusapi_PROPERTY_LIST_data2)),
+					    clusapi_PROPERTY_LIST_data2,
 					    clusapi_PROPERTY_LIST_check2);
 
 	return suite;
diff --git a/source4/torture/ndr/drsblobs.c b/source4/torture/ndr/drsblobs.c
index b1a4711aa96..0ef2d95056b 100644
--- a/source4/torture/ndr/drsblobs.c
+++ b/source4/torture/ndr/drsblobs.c
@@ -513,37 +513,35 @@ struct torture_suite *ndr_drsblobs_suite(TALLOC_CTX *ctx)
 	torture_suite_add_ndr_pull_test(suite, ForestTrustInfo, forest_trust_info_data_out, forest_trust_info_check_out);
 	torture_suite_add_ndr_pull_test(suite, trustDomainPasswords, trust_domain_passwords_in, trust_domain_passwords_check_in);
 
-	torture_suite_add_ndr_pull_validate_test(suite,
+	torture_suite_add_ndr_pull_validate_test_blob(suite,
 					    trustAuthInOutBlob,
 					    base64_decode_data_blob_talloc(suite, trustAuthIncoming),
 					    NULL);
 
-	torture_suite_add_ndr_pull_validate_test(suite,
+	torture_suite_add_ndr_pull_validate_test_blob(suite,
 					    trustAuthInOutBlob,
 					    base64_decode_data_blob_talloc(suite, trustAuthOutgoing),
 					    NULL);
 
 	torture_suite_add_ndr_pull_validate_test(empty1_suite, supplementalCredentialsBlob,
-					data_blob_const(supplementalCredentials_empty1,
-						sizeof(supplementalCredentials_empty1)),
+					supplementalCredentials_empty1,
 					supplementalCredentials_empty1_check);
 
 	torture_suite_add_ndr_pull_validate_test(empty2_suite, supplementalCredentialsBlob,
-					data_blob_const(supplementalCredentials_empty2,
-						sizeof(supplementalCredentials_empty2)),
+					supplementalCredentials_empty2,
 					supplementalCredentials_empty2_check);
 
-	torture_suite_add_ndr_pull_validate_test(alpha13_suite,
+	torture_suite_add_ndr_pull_validate_test_blob(alpha13_suite,
 						 supplementalCredentialsBlob,
 						 base64_decode_data_blob_talloc(suite, alpha13_supplementalCredentials),
 						 alpha13_supplementalCredentials_check);
 
-	torture_suite_add_ndr_pull_validate_test(release_4_1_0rc3_suite,
+	torture_suite_add_ndr_pull_validate_test_blob(release_4_1_0rc3_suite,
 						 supplementalCredentialsBlob,
 						 base64_decode_data_blob_talloc(suite, release_4_1_0rc3_supplementalCredentials),
 						 release_4_1_0rc3_supplementalCredentials_check);
 
-	torture_suite_add_ndr_pull_validate_test(release_4_5_0pre_GPG_suite,
+	torture_suite_add_ndr_pull_validate_test_blob(release_4_5_0pre_GPG_suite,
 						 supplementalCredentialsBlob,
 						 base64_decode_data_blob_talloc(suite, release_4_5_0pre_GPG_supplementalCredentials),
 						 release_4_5_0pre_GPG_supplementalCredentials_check);
@@ -551,7 +549,7 @@ struct torture_suite *ndr_drsblobs_suite(TALLOC_CTX *ctx)
 	/* This last byte is typically not initialized, we force to zero to allow pull/push */
 	win2012R2_supplementalCredentials_blob = base64_decode_data_blob_talloc(suite, win2012R2_supplementalCredentials);
 	win2012R2_supplementalCredentials_blob.data[win2012R2_supplementalCredentials_blob.length-1] = 0;
-	torture_suite_add_ndr_pull_validate_test(win2012R2_suite,
+	torture_suite_add_ndr_pull_validate_test_blob(win2012R2_suite,
 						 supplementalCredentialsBlob,
 						 win2012R2_supplementalCredentials_blob,
 						 win2012R2_supplementalCredentials_check);
diff --git a/source4/torture/ndr/krb5pac.c b/source4/torture/ndr/krb5pac.c
index d78729bda67..fe0309f902d 100644
--- a/source4/torture/ndr/krb5pac.c
+++ b/source4/torture/ndr/krb5pac.c
@@ -636,8 +636,7 @@ struct torture_suite *ndr_krb5pac_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA_RAW,
-					data_blob_const(PAC_DATA_data,
-							sizeof(PAC_DATA_data)),
+					PAC_DATA_data,
 					NULL);
 	/*
 	 * We can't use torture_suite_add_ndr_pull_validate_test()
@@ -652,8 +651,7 @@ struct torture_suite *ndr_krb5pac_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA_RAW,
-					data_blob_const(PAC_DATA_data2,
-							sizeof(PAC_DATA_data2)),
+					PAC_DATA_data2,
 					NULL);
 	/*
 	 * We can't use torture_suite_add_ndr_pull_validate_test()
@@ -668,47 +666,39 @@ struct torture_suite *ndr_krb5pac_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA_RAW,
-					data_blob_const(PAC_DATA_data3,
-							sizeof(PAC_DATA_data3)),
+					PAC_DATA_data3,
 					NULL);
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA,
-					data_blob_const(PAC_DATA_data3,
-							sizeof(PAC_DATA_data3)),
+					PAC_DATA_data3,
 					NULL);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA_RAW,
-					data_blob_const(PAC_DATA_pkinit_AS,
-							sizeof(PAC_DATA_pkinit_AS)),
+					PAC_DATA_pkinit_AS,
 					NULL);
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA,
-					data_blob_const(PAC_DATA_pkinit_AS,
-							sizeof(PAC_DATA_pkinit_AS)),
+					PAC_DATA_pkinit_AS,
 					PAC_DATA_pkinit);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA_RAW,
-					data_blob_const(PAC_DATA_pkinit_TGS,
-							sizeof(PAC_DATA_pkinit_TGS)),
+					PAC_DATA_pkinit_TGS,
 					NULL);
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_DATA,
-					data_blob_const(PAC_DATA_pkinit_AS,
-							sizeof(PAC_DATA_pkinit_TGS)),
+					PAC_DATA_pkinit_AS,
 					PAC_DATA_pkinit);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_CREDENTIAL_DATA_NDR,
-					data_blob_const(PAC_DATA_pkinit_PAC_CREDENTIAL_DATA_NDR,
-							sizeof(PAC_DATA_pkinit_PAC_CREDENTIAL_DATA_NDR)),
+					PAC_DATA_pkinit_PAC_CREDENTIAL_DATA_NDR,
 					PAC_CREDENTIAL_DATA_NDR_check);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					PAC_CREDENTIAL_NTLM_SECPKG,
-					data_blob_const(PAC_DATA_pkinit_PAC_CREDENTIAL_NTLM_SECPKG,
-							sizeof(PAC_DATA_pkinit_PAC_CREDENTIAL_NTLM_SECPKG)),
+					PAC_DATA_pkinit_PAC_CREDENTIAL_NTLM_SECPKG,
 					PAC_CREDENTIAL_NTLM_SECPKG_check);
 
 	return suite;
diff --git a/source4/torture/ndr/nbt.c b/source4/torture/ndr/nbt.c
index 48f8c1087dc..ec5cb902671 100644
--- a/source4/torture/ndr/nbt.c
+++ b/source4/torture/ndr/nbt.c
@@ -231,22 +231,22 @@ struct torture_suite *ndr_nbt_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    netlogon_samlogon_response,
-					    data_blob_const(netlogon_samlogon_response_data, sizeof(netlogon_samlogon_response_data)),
+					    netlogon_samlogon_response_data,
 					    netlogon_samlogon_response_check);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    nbt_netlogon_packet,
-					    data_blob_const(nbt_netlogon_packet_data, sizeof(nbt_netlogon_packet_data)),
+					    nbt_netlogon_packet_data,
 					    nbt_netlogon_packet_check);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    nbt_netlogon_packet,
-					    data_blob_const(nbt_netlogon_packet_logon_primary_query_data, sizeof(nbt_netlogon_packet_logon_primary_query_data)),
+					    nbt_netlogon_packet_logon_primary_query_data,
 					    nbt_netlogon_packet_logon_primary_query_check);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    netlogon_samlogon_response,
-					    data_blob_const(netlogon_samlogon_response_data2, sizeof(netlogon_samlogon_response_data2)),
+					    netlogon_samlogon_response_data2,
 					    netlogon_samlogon_response_check2);
 
 	return suite;
diff --git a/source4/torture/ndr/ndr.h b/source4/torture/ndr/ndr.h
index 37ee9f6eb23..00dc14c680c 100644
--- a/source4/torture/ndr/ndr.h
+++ b/source4/torture/ndr/ndr.h
@@ -70,7 +70,16 @@ _PUBLIC_ struct torture_test *_torture_suite_add_ndr_pull_inout_test(
 			 flags, flags2, \
 			 (bool (*) (struct torture_context *, void *)) check_fn);
 
-#define torture_suite_add_ndr_pull_validate_test(suite,name,data_blob,check_fn) \
+#define torture_suite_add_ndr_pull_validate_test(suite,name,data,check_fn) \
+		_torture_suite_add_ndr_pullpush_test(suite, #name "_VALIDATE", \
+			 (ndr_pull_flags_fn_t)ndr_pull_ ## name, \
+			 (ndr_push_flags_fn_t)ndr_push_ ## name, \
+			 data_blob_const(data, sizeof(data)), \
+			 sizeof(struct name), \
+			 NDR_SCALARS|NDR_BUFFERS, 0, \
+			 (bool (*) (struct torture_context *, void *)) check_fn);
+
+#define torture_suite_add_ndr_pull_validate_test_blob(suite,name,data_blob,check_fn) \
 		_torture_suite_add_ndr_pullpush_test(suite, #name "_VALIDATE", \
 			 (ndr_pull_flags_fn_t)ndr_pull_ ## name, \
 			 (ndr_push_flags_fn_t)ndr_push_ ## name, \
diff --git a/source4/torture/ndr/negoex.c b/source4/torture/ndr/negoex.c
index cad45748611..1cd2d54c2ae 100644
--- a/source4/torture/ndr/negoex.c
+++ b/source4/torture/ndr/negoex.c
@@ -93,7 +93,7 @@ struct torture_suite *ndr_negoex_suite(TALLOC_CTX *ctx)
 	struct torture_suite *suite = torture_suite_create(ctx, "negoex");
 
 	torture_suite_add_ndr_pull_validate_test(suite, negoex_MESSAGE_ARRAY,
-					    data_blob_const(negoex_MESSAGE_ARRAY_data, sizeof(negoex_MESSAGE_ARRAY_data)),
+					    negoex_MESSAGE_ARRAY_data,
 					    negoex_MESSAGE_ARRAY_check);
 
 	return suite;
diff --git a/source4/torture/ndr/ntlmssp.c b/source4/torture/ndr/ntlmssp.c
index 7e42166eb0f..4127ce80ebe 100644
--- a/source4/torture/ndr/ntlmssp.c
+++ b/source4/torture/ndr/ntlmssp.c
@@ -284,12 +284,12 @@ struct torture_suite *ndr_ntlmssp_suite(TALLOC_CTX *ctx)
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    NEGOTIATE_MESSAGE,
-					    data_blob_const(ntlmssp_NEGOTIATE_MESSAGE_data, sizeof(ntlmssp_NEGOTIATE_MESSAGE_data)),
+					    ntlmssp_NEGOTIATE_MESSAGE_data,
 					    ntlmssp_NEGOTIATE_MESSAGE_check);
 
 	torture_suite_add_ndr_pull_validate_test(suite,
 					    CHALLENGE_MESSAGE,
-					    data_blob_const(ntlmssp_CHALLENGE_MESSAGE_data, sizeof(ntlmssp_CHALLENGE_MESSAGE_data)),
+					    ntlmssp_CHALLENGE_MESSAGE_data,
 					    ntlmssp_CHALLENGE_MESSAGE_check);
 
 	return suite;