summaryrefslogtreecommitdiff
path: root/tests/keyctl/add/useradd/runtest.sh
diff options
context:
space:
mode:
Diffstat (limited to 'tests/keyctl/add/useradd/runtest.sh')
-rw-r--r--tests/keyctl/add/useradd/runtest.sh16
1 files changed, 3 insertions, 13 deletions
diff --git a/tests/keyctl/add/useradd/runtest.sh b/tests/keyctl/add/useradd/runtest.sh
index e421a89..956fb98 100644
--- a/tests/keyctl/add/useradd/runtest.sh
+++ b/tests/keyctl/add/useradd/runtest.sh
@@ -11,8 +11,7 @@ echo "++++ BEGINNING TEST" >$OUTPUTFILE
# check that we can add a user key to the session keyring
marker "ADD USER KEY"
-create_key user wibble stuff @s
-expect_keyid keyid
+create_key --new=keyid user wibble stuff @s
# read back what we put in it
marker "PRINT PAYLOAD"
@@ -21,8 +20,7 @@ expect_payload payload "stuff"
# check that we can add a hex-encoded user key to the session keyring
marker "ADD HEX USER KEY"
-create_key -x user wibble "73 7475 66 66 " @s
-expect_keyid keyid
+create_key --update=$keyid -x user wibble "73 7475 66 66 " @s
# read back what we put in it
marker "PRINT PAYLOAD"
@@ -31,15 +29,7 @@ expect_payload payload "stuff"
# check that we can update a user key
marker "UPDATE USER KEY"
-create_key user wibble lizard @s
-
-# check we get the same key ID back
-expect_keyid keyid2
-
-if [ "x$keyid" != "x$keyid2" ]
-then
- failed
-fi
+create_key --update=$keyid user wibble lizard @s
# read back what we changed it to
marker "PRINT UPDATED PAYLOAD"