tests: Use hex input for keyctl/dh_compute/bad-args
Use keyctl add's hex input capability for keyctl/dh_compute/bad-args rather
than an "echo -e | keyctl padd" construct.
Signed-off-by: David Howells <dhowells@redhat.com>
diff --git a/tests/keyctl/dh_compute/bad-args/runtest.sh b/tests/keyctl/dh_compute/bad-args/runtest.sh
index 6fcba06..5c4c160 100644
--- a/tests/keyctl/dh_compute/bad-args/runtest.sh
+++ b/tests/keyctl/dh_compute/bad-args/runtest.sh
@@ -18,50 +18,50 @@
# Prime, generator, and key values created with:
# openssl dhparam 2048 -check -out dh.pem
# openssl genpkey -paramfile dh.pem -text
-prime="\x00\xb6\x89\x4d\x8f\xf7\xaf\x56\xd4\x46\xc9\x50\xc7\xe9\x1d"
-prime+="\x29\x8a\x07\x8d\xae\xa7\x79\x66\xf1\x1f\xc1\x6f\x22\x92\x11"
-prime+="\x73\x7f\x1f\x39\xce\xf3\xda\xd7\x87\x2a\x53\x8f\x6c\x8f\x9a"
-prime+="\x27\x6a\x7c\xf7\x7b\xb2\xd6\x3a\x87\x2a\x4d\xb9\xed\x12\xae"
-prime+="\x0f\x1c\x69\xaf\x9b\xf2\xf2\xe3\x69\x1d\x36\x15\xa1\xd7\xd5"
-prime+="\x77\xa8\x7d\x1c\xb4\xab\xa0\x49\x4b\xae\x0c\x24\x9b\x0c\xce"
-prime+="\xef\x6b\x7a\xb9\xa7\xbe\x70\xb5\xb4\x5e\x4c\xf7\xcb\x71\xad"
-prime+="\x8f\xeb\x7a\x4d\x6c\x7c\xcb\x96\xd5\x29\x8f\x0f\xee\xb4\x78"
-prime+="\x77\x60\x5e\x80\xa0\x33\x86\x91\xe3\x58\x62\xf0\xf4\xcb\xb2"
-prime+="\x09\xe1\x7d\xd9\xfe\xbc\xce\x4c\x21\x57\x70\x06\xce\xb1\x15"
-prime+="\x7b\x18\x15\x92\xd2\xf7\x84\xba\x44\xe0\x06\xc3\x14\xdf\x53"
-prime+="\x06\xbd\xbb\x17\xa0\x10\xb3\x66\x0d\x47\x93\x56\xd8\xd5\x2c"
-prime+="\x5a\xf0\x14\x53\x6c\x20\x89\x7e\x76\x53\x21\x8e\x2c\x7a\x65"
-prime+="\x0a\x73\xdc\x27\x58\x45\x98\xde\x92\xde\x5c\x62\x70\x67\x71"
-prime+="\xfa\x2d\x67\xf6\x25\x44\x1d\x91\x1c\xa0\x3f\x21\x49\xb6\xd4"
-prime+="\xc7\x6b\x5e\xcd\x98\x96\xe9\xd7\x99\xa3\xa5\x00\xec\xec\xc5"
-prime+="\x19\xe3\x1b\x71\x15\x4d\x7b\x36\x1b\xd0\xdd\x15\xf7\xce\x8d"
-prime+="\xfc\x63"
+prime="00b6894d8ff7af56d446c950c7e91d"
+prime+="298a078daea77966f11fc16f229211"
+prime+="737f1f39cef3dad7872a538f6c8f9a"
+prime+="276a7cf77bb2d63a872a4db9ed12ae"
+prime+="0f1c69af9bf2f2e3691d3615a1d7d5"
+prime+="77a87d1cb4aba0494bae0c249b0cce"
+prime+="ef6b7ab9a7be70b5b45e4cf7cb71ad"
+prime+="8feb7a4d6c7ccb96d5298f0feeb478"
+prime+="77605e80a0338691e35862f0f4cbb2"
+prime+="09e17dd9febcce4c21577006ceb115"
+prime+="7b181592d2f784ba44e006c314df53"
+prime+="06bdbb17a010b3660d479356d8d52c"
+prime+="5af014536c20897e7653218e2c7a65"
+prime+="0a73dc27584598de92de5c62706771"
+prime+="fa2d67f625441d911ca03f2149b6d4"
+prime+="c76b5ecd9896e9d799a3a500ececc5"
+prime+="19e31b71154d7b361bd0dd15f7ce8d"
+prime+="fc63"
-generator="\x02"
+generator="02"
-private="\x40\x94\x9d\xa2\xca\x2b\x7c\x35\x3d\xe3\x8f\xef\xb0\x6d\xdd"
-private+="\x0d\x67\x47\x9a\x63\x61\xc8\x9e\x77\xb9\x80\xd2\x48\x6c\x4d"
-private+="\x31\x97\x1e\xb8\x8f\x65\x72\x06\x99\x73\xe3\xae\x5a\x43\xce"
-private+="\x76\xbc\xcb\x35\xea\x05\xac\x65\x38\xeb\x0e\xa6\xad\xee\x49"
-private+="\x37\x60\x04\x35\xdd\x79\x40\x88\x5d\x2e\x3f\x78\xc7\x28\x08"
-private+="\x34\xf8\x78\xd3\xd5\x50\xcc\x93\x05\x33\x0b\xb8\xf0\x20\x85"
-private+="\xee\x6c\x23\x0d\x42\xd8\x4e\xb6\x7a\x24\x5b\x92\x81\x7f\xd1"
-private+="\x54\xbc\xb1\x39\x4a\x28\x9d\x11\xaf\xb5\xa1\xe5\x0e\x13\x95"
-private+="\x09\x08\xaf\x70\x75\x67\x04\xe9\xbf\x03\xdf\xf0\xe5\xd4\x90"
-private+="\x74\x38\x41\xc5\x34\xcb\x7e\x2c\xf4\xb9\xf0\x49\x3a\x73\x0b"
-private+="\x0d\x71\x09\x6a\x16\xbd\xc0\xe8\x52\xf1\x75\x75\x51\x34\xb2"
-private+="\xb4\x11\x12\x28\x0a\x88\x21\x27\x28\xaf\xbe\x16\xd4\x17\xf3"
-private+="\x18\x93\xcb\xe4\x42\xe0\x6d\x21\x2d\x8e\xfe\x22\x7a\xa0\x03"
-private+="\x9a\x65\xce\x99\x81\x07\xfa\xe2\x78\x51\x1c\x6b\xf4\xd5\x99"
-private+="\x32\x53\x4a\xe9\xfc\x39\xdb\x80\x63\x51\x63\xc0\x54\x66\x57"
-private+="\x50\x08\x66\xd5\x46\x1c\x5f\xa3\x54\x02\x38\x32\x4a\x29\xf3"
-private+="\x16\xe0\x68\xf3\xba\x17\x37\xd0\x42\xcb\x51\xa8\x97\x1b\xc7"
-private+="\xa2"
+private="40949da2ca2b7c353de38fefb06ddd"
+private+="0d67479a6361c89e77b980d2486c4d"
+private+="31971eb88f6572069973e3ae5a43ce"
+private+="76bccb35ea05ac6538eb0ea6adee49"
+private+="37600435dd7940885d2e3f78c72808"
+private+="34f878d3d550cc9305330bb8f02085"
+private+="ee6c230d42d84eb67a245b92817fd1"
+private+="54bcb1394a289d11afb5a1e50e1395"
+private+="0908af70756704e9bf03dff0e5d490"
+private+="743841c534cb7e2cf4b9f0493a730b"
+private+="0d71096a16bdc0e852f175755134b2"
+private+="b41112280a88212728afbe16d417f3"
+private+="1893cbe442e06d212d8efe227aa003"
+private+="9a65ce998107fae278511c6bf4d599"
+private+="32534ae9fc39db80635163c0546657"
+private+="500866d5461c5fa3540238324a29f3"
+private+="16e068f3ba1737d042cb51a8971bc7"
+private+="a2"
-pcreate_key --new=primeid "-e $prime" user dh:prime @s
-pcreate_key --new=generatorid "-e $generator" user dh:generator @s
-pcreate_key --new=privateid "-e $private" user dh:private @s
-pcreate_key --new=logonid "-e \x00" logon dh:logon @s
+create_key --new=primeid -x user dh:prime $prime @s
+create_key --new=generatorid -x user dh:generator $generator @s
+create_key --new=privateid -x user dh:private $private @s
+create_key --new=logonid -x logon dh:logon "00" @s
marker "CHECK WRONG KEY TYPE"
dh_compute --fail $privateid $primeid $logonid
