From caf3c3c3151312573aa14cbaedc16735326240ba Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 2 Aug 2016 13:16:35 +1200 Subject: [PATCH 1/2] torture/backupkey: Allow WERR_INVALID_ACCESS, WERR_INVALID_PARAM or WERR_INVALID_DATA The use of the wrong key can still create structures that parse as a SID, therefore we can sometimes get an unusual error, which becomes a flapping test BUG: https://bugzilla.samba.org/show_bug.cgi?id=12107 Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher (cherry picked from commit 664bde19bf1db1b3740621cdf3f46f9bfd0e8452) --- source4/torture/rpc/backupkey_heimdal.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source4/torture/rpc/backupkey_heimdal.c b/source4/torture/rpc/backupkey_heimdal.c index c0db48d..370700a 100644 --- a/source4/torture/rpc/backupkey_heimdal.c +++ b/source4/torture/rpc/backupkey_heimdal.c @@ -1979,10 +1979,11 @@ static bool test_ServerWrap_decrypt_wrong_stuff(struct torture_context *tctx, WERR_INVALID_ACCESS, "decrypt should fail with WERR_INVALID_ACCESS"); } else { - if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) { + if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_ACCESS) + && !W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) { torture_assert_werr_equal(tctx, r.out.result, WERR_INVALID_DATA, - "decrypt should fail with WERR_INVALID_PARAM or WERR_INVALID_DATA"); + "decrypt should fail with WERR_INVALID_ACCESS, WERR_INVALID_PARAM or WERR_INVALID_DATA"); } } -- 1.9.1 From 84a2eea893faed1713cd1cbfe1f6019103dd8ed0 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 2 Aug 2016 13:20:46 +1200 Subject: [PATCH 2/2] selftest: Merge alternate error codes into backupkey from backupkey_heimdal This is from cea4a4b9b22c78f9736e2290d302a88644db4031 and 613d085a63ee554084cb99d2150921dd108f6b77 BUG: https://bugzilla.samba.org/show_bug.cgi?id=12107 Signed-off-by: Andrew Bartlett Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Wed Aug 3 21:43:21 CEST 2016 on sn-devel-144 (cherry picked from commit 065dcc8a45fa77b00355b61a8f25d046c9d349cf) --- source4/torture/rpc/backupkey.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source4/torture/rpc/backupkey.c b/source4/torture/rpc/backupkey.c index ca981c2..276fa7f 100644 --- a/source4/torture/rpc/backupkey.c +++ b/source4/torture/rpc/backupkey.c @@ -2217,10 +2217,12 @@ static bool test_ServerWrap_decrypt_wrong_stuff(struct torture_context *tctx, WERR_INVALID_ACCESS, "decrypt should fail with WERR_INVALID_ACCESS"); } else { - torture_assert_werr_equal(tctx, - r.out.result, - WERR_INVALID_PARAM, - "decrypt should fail with WERR_INVALID_PARAM"); + if (!W_ERROR_EQUAL(r.out.result, WERR_INVALID_ACCESS) + && !W_ERROR_EQUAL(r.out.result, WERR_INVALID_PARAM)) { + torture_assert_werr_equal(tctx, r.out.result, + WERR_INVALID_DATA, + "decrypt should fail with WERR_INVALID_ACCESS, WERR_INVALID_PARAM or WERR_INVALID_DATA"); + } } /* Decrypt */ -- 1.9.1