From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Boeckel Date: Thu, 29 Aug 2019 20:43:14 +0000 Subject: [PATCH v2 06/13] tests/revoke: test key revokation in the revoke tests Message-Id: <20190829204322.8015-7-mathstuf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit List-Id: To: keyrings@vger.kernel.org Signed-off-by: Ben Boeckel --- tests/keyctl/revoke/valid/runtest.sh | 20 ++++++++++++++++++++ tests/keyctl/timeout/valid/runtest.sh | 17 ----------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/tests/keyctl/revoke/valid/runtest.sh b/tests/keyctl/revoke/valid/runtest.sh index b015acc..a499c0b 100644 --- a/tests/keyctl/revoke/valid/runtest.sh +++ b/tests/keyctl/revoke/valid/runtest.sh @@ -45,6 +45,16 @@ marker "CHECK NO READ PAYLOAD" print_key --fail $keyid expect_error EKEYREVOKED +# invalidating the new keyring should also fail +marker "CHECK NO SET KEY TIMEOUT" +timeout_key --fail $keyid 20 +expect_error EKEYREVOKED + +# invalidating the new keyring should also fail +marker "CHECK NO INVALIDATE KEY" +invalidate_key --fail $keyid +expect_error EKEYREVOKED + # remove the key we added marker "UNLINK KEY" unlink_key $keyid $keyringid @@ -63,6 +73,16 @@ marker "CHECK NO VALIDATE KEYRING" describe_key --fail $keyringid expect_error EKEYREVOKED +# invalidating the new keyring should also fail +marker "CHECK NO SET KEYRING TIMEOUT" +timeout_key --fail $keyringid 20 +expect_error EKEYREVOKED + +# invalidating the new keyring should also fail +marker "CHECK NO INVALIDATE KEYRING" +invalidate_key --fail $keyringid +expect_error EKEYREVOKED + # remove the keyring we added marker "UNLINK KEYRING" unlink_key $keyringid @s diff --git a/tests/keyctl/timeout/valid/runtest.sh b/tests/keyctl/timeout/valid/runtest.sh index 5f7f2f3..ce27b68 100644 --- a/tests/keyctl/timeout/valid/runtest.sh +++ b/tests/keyctl/timeout/valid/runtest.sh @@ -77,23 +77,6 @@ unlink_key $keyid $keyringid marker "ADD KEY" create_key --new=keyid user lizard gizzard $keyringid -# set a silly timeout on the key -marker "SET BIG TIMEOUT" -timeout_key $keyid 10000000 - -# revoke the key -marker "REVOKE KEY" -revoke_key $keyid - -# check we can no longer set the key's timeout -marker "CHECK NO SET KEY TIMEOUT" -timeout_key --fail $keyid 20 -expect_error EKEYREVOKED - -# remove the key we added -marker "UNLINK KEY" -unlink_key $keyid $keyringid - # revoke the keyring marker "TIMEOUT KEYRING" timeout_key $keyringid 1 -- 2.21.0