test: Use hex-converting padd for dh_compute tests

Use hex-converting padd to load data for dh_compute tests.

Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 124 insertions, 124 deletions

diff --git a/tests/keyctl/dh_compute/valid/runtest.sh b/tests/keyctl/dh_compute/valid/runtest.sh
index 5ad1d14..1ff2687 100644
--- a/tests/keyctl/dh_compute/valid/runtest.sh
+++ b/tests/keyctl/dh_compute/valid/runtest.sh
@@ -18,45 +18,45 @@ echo "++++ BEGINNING TEST" >$OUTPUTFILE
 # 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"
-
-generator="\x02"
-
-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"
+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="02"
+
+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"
 
 read -d '' public <<"EOF"
 a4cf1f93 95fce03f d02aaece da1f86bd d8d77b69 29039fcc bd138c98 2483bf9c
@@ -69,13 +69,13 @@ a328e894 acc343f4 66a95281 86cea6a3 93eb4fee f83c0e2e f4a00ce6 fcc9ef81
 cc4624d5 ba659411 d1ba7b5f 14a3e286 d42e6ac8 afa9f846 41cb7cb5 66965725
 EOF
 
-pcreate_key "-e $prime" user dh:prime @s
+create_key -x user dh:prime $prime @s
 expect_keyid primeid
 
-pcreate_key "-e $generator" user dh:generator @s
+create_key -x user dh:generator $generator @s
 expect_keyid generatorid
 
-pcreate_key "-e $private" user dh:private @s
+create_key -x user dh:private $private @s
 expect_keyid privateid
 
 marker "COMPUTE DH PUBLIC KEY"
@@ -94,44 +94,44 @@ echo "++++ FINISHED TEST: $result" >>$OUTPUTFILE
 # SHA-256
 
 # XephemCAVS
-private="\x81\xb2\xc6\x5f\x5c\xba\xc0\x0b\x13\x53\xac\x38\xbd\x77\xa2\x5a"
-private+="\x86\x50\xed\x48\x5e\x41\x3e\xac\x1d\x6c\x48\x85"
+private="81b2c65f5cbac00b1353ac38bd77a25a"
+private+="8650ed485e413eac1d6c4885"
 
 # P
-prime="\xa3\xcc\x62\x23\xe5\x0c\x6e\x3f\x7b\xb0\x58\x1d\xcb\x9e\x9f\xf0"
-prime+="\x2c\x58\x07\x68\x32\x8a\x15\x20\x7b\x1c\x32\x31\x7f\xb7\x84\x96"
-prime+="\x81\x5e\x3c\xf7\xf9\xd0\x9c\xcb\x9f\xa8\x40\xff\x47\x98\x51\x1a"
-prime+="\x17\xb5\x59\x28\x72\x1e\x5d\xfb\xcc\xc5\x41\x47\xe0\xf0\x5f\x85"
-prime+="\xb3\xac\x41\x0b\x6a\xe3\xf5\x9b\x79\x6f\x3f\xea\xc7\xfc\x52\x49"
-prime+="\x21\x7e\xb2\xa0\x45\x88\x29\x3a\x5a\xde\x22\x78\x79\xf4\x6c\xeb"
-prime+="\x56\x45\x7b\x5c\x43\x12\x93\xe5\xe1\x04\xd1\xb9\x64\xbd\x2c\xdf"
-prime+="\xde\xff\xa0\x40\x49\xa9\x1e\x67\xee\x8c\x86\xe9\x44\xf0\x4f\x94"
-prime+="\x4a\x30\xe3\x61\xf8\xd1\x5d\x17\xe5\x01\x0c\xab\xb4\xef\x40\xc0"
-prime+="\xeb\xa5\xf4\xa2\x52\xd4\xfd\x6c\xf9\xda\xe6\x0e\x86\xe4\xb3\x00"
-prime+="\x9b\x1d\xfc\x92\x66\x70\x35\x72\x61\x58\x7a\xd0\x5c\x00\xa6\xc6"
-prime+="\xf0\x10\x6c\xec\x8f\xc5\x91\x31\x51\x50\x84\xa8\x70\x59\x41\x65"
-prime+="\xb4\x93\x90\xdb\x2d\x00\xe7\x53\x8f\x23\x0d\x53\x2f\x4a\x4e\xca"
-prime+="\x83\x09\xd7\x07\xc0\xb3\x83\x5c\xee\x04\xf3\xca\x55\x8a\x22\xc6"
-prime+="\xb5\x20\xfe\x25\xde\x6f\xfa\x90\xef\xda\x49\x27\xd0\x18\x59\x4c"
-prime+="\x0c\x0b\x77\x06\x73\x93\xb7\xf1\xe0\xfc\x7c\xf2\x16\xaf\xf3\x9f"
+prime="a3cc6223e50c6e3f7bb0581dcb9e9ff0"
+prime+="2c580768328a15207b1c32317fb78496"
+prime+="815e3cf7f9d09ccb9fa840ff4798511a"
+prime+="17b55928721e5dfbccc54147e0f05f85"
+prime+="b3ac410b6ae3f59b796f3feac7fc5249"
+prime+="217eb2a04588293a5ade227879f46ceb"
+prime+="56457b5c431293e5e104d1b964bd2cdf"
+prime+="deffa04049a91e67ee8c86e944f04f94"
+prime+="4a30e361f8d15d17e5010cabb4ef40c0"
+prime+="eba5f4a252d4fd6cf9dae60e86e4b300"
+prime+="9b1dfc926670357261587ad05c00a6c6"
+prime+="f0106cec8fc59131515084a870594165"
+prime+="b49390db2d00e7538f230d532f4a4eca"
+prime+="8309d707c0b3835cee04f3ca558a22c6"
+prime+="b520fe25de6ffa90efda4927d018594c"
+prime+="0c0b77067393b7f1e0fc7cf216aff39f"
 
 # YephemIUT
-xa="\x9a\x70\x82\x2d\x3f\x06\x12\x3d\x0e\x51\x8e\xe1\x16\x51\xe5\xf6"
-xa+="\xb1\x19\xdc\x3b\x97\xd5\xb1\xc0\xa2\xa6\xf6\xde\x94\x25\x64\xba"
-xa+="\x10\x06\x1e\xec\xde\xb7\x36\x9c\xa5\x37\x49\x9e\x04\xb0\x36\xe9"
-xa+="\x7f\x44\x5a\x95\x6f\x63\x69\xae\x6e\x63\xfd\x27\xea\xe3\xe3\x47"
-xa+="\x85\x54\x47\xd3\xba\xc1\xc6\x0c\x10\xe7\x35\x07\x72\xc6\xc0\xc6"
-xa+="\xfb\xf9\xca\x3e\x38\xf0\xe8\x65\x88\x25\xd3\xb2\x0f\x1f\x02\x8f"
-xa+="\x35\xe3\x4d\x12\x35\x10\x3d\xf2\x33\x9b\x5b\x09\x9d\x3f\xe3\xe5"
-xa+="\x34\x6a\x69\x16\x42\xba\xc5\xb0\xbb\x03\xcd\x5d\x04\xd7\x56\x26"
-xa+="\x21\x49\x3f\xf1\xc4\x27\x3b\x6a\x45\xc5\xec\xb0\xb5\xe9\x08\xa0"
-xa+="\xf9\xf5\x62\x28\x2e\x85\x3e\xfc\x9a\x7e\xa1\x12\xe9\x47\x4f\xf6"
-xa+="\x94\x18\xf7\xc4\x7a\xe9\x66\xd4\x52\x4c\xa1\x70\x1b\x60\xa4\xbe"
-xa+="\x15\xc7\x5e\x27\xb4\x05\x80\x64\x68\x15\x6e\x02\xcb\xc5\x8f\xf4"
-xa+="\x66\x3c\x96\xac\x0c\x87\x36\x81\x35\xfa\x9b\x0b\xb6\x33\x7a\xe2"
-xa+="\x58\x52\x1d\x7d\x60\xc2\xa9\x1b\x4e\xd7\x72\xad\x65\x03\x40\x49"
-xa+="\x97\xf6\x79\x9d\xf6\x63\xa8\x99\x9c\xfd\x74\x7f\xa0\x67\xb9\x05"
-xa+="\x8a\xb3\x3b\xc1\x45\x94\x36\x6f\x28\xf5\xa2\xd9\x00\xb6\x46\x7a"
+xa="9a70822d3f06123d0e518ee11651e5f6"
+xa+="b119dc3b97d5b1c0a2a6f6de942564ba"
+xa+="10061eecdeb7369ca537499e04b036e9"
+xa+="7f445a956f6369ae6e63fd27eae3e347"
+xa+="855447d3bac1c60c10e7350772c6c0c6"
+xa+="fbf9ca3e38f0e8658825d3b20f1f028f"
+xa+="35e34d1235103df2339b5b099d3fe3e5"
+xa+="346a691642bac5b0bb03cd5d04d75626"
+xa+="21493ff1c4273b6a45c5ecb0b5e908a0"
+xa+="f9f562282e853efc9a7ea112e9474ff6"
+xa+="9418f7c47ae966d4524ca1701b60a4be"
+xa+="15c75e27b405806468156e02cbc58ff4"
+xa+="663c96ac0c87368135fa9b0bb6337ae2"
+xa+="58521d7d60c2a91b4ed772ad65034049"
+xa+="97f6799df663a8999cfd747fa067b905"
+xa+="8ab33bc14594366f28f5a2d900b6467a"
 
 # Z
 read -d '' shared <<"EOF"
@@ -146,21 +146,21 @@ e0b7f6c4 e24c2154 7eb19fce f8dbed10 b06a9cce 971c0f0f ba7c1d5c b5035eaa
 EOF
 
 # OI
-otherinfo="\xa1\xb2\xc3\xd4\xe5\x43\x41\x56\x53\x69\x64\x0d\x64\xc1\xb2"
-otherinfo+="\x33\x61\xb2\x61\xde\x78\x68\x8e\xa8\x65\xfc\xff\x11\x3c\x84"
+otherinfo="a1b2c3d4e54341565369640d64c1b2"
+otherinfo+="3361b261de78688ea865fcff113c84"
 
 # DKM
 read -d '' derived <<"EOF"
 8284e313 02c8a26b 393ec52d 9f9e0882
 EOF
 
-pcreate_key "-e $prime" user dh:prime @s
+create_key -x user dh:prime $prime @s
 expect_keyid primeid
 
-pcreate_key "-e $xa" user dh:xa @s
+create_key -x user dh:xa $xa @s
 expect_keyid xaid
 
-pcreate_key "-e $private" user dh:private @s
+create_key -x user dh:private $private @s
 expect_keyid privateid
 
 marker "COMPUTE DH SHARED SECRET"
@@ -168,10 +168,10 @@ dh_compute $privateid $primeid $xaid
 expect_multiline payload "$shared"
 
 marker "COMPUTE DERIVED KEY FROM DH SHARED SECRET (SHA-256)"
-echo -e -n $otherinfo | dh_compute_kdf_oi $privateid $primeid $xaid 16 "sha256"
+echo -e -n $otherinfo | dh_compute_kdf_oi -x $privateid $primeid $xaid 16 "sha256"
 expect_multiline payload "$derived"
 
-pcreate_key "-e \x01" user dh:leadingzero @s
+create_key -x user dh:leadingzero "01" @s
 expect_keyid lzid
 
 read -d '' derived2 <<"EOF"
@@ -179,50 +179,50 @@ read -d '' derived2 <<"EOF"
 EOF
 
 marker "COMPUTE DERIVED KEY WITH LEADING ZEROS"
-echo -e -n $otherinfo | dh_compute_kdf_oi $privateid $primeid $lzid 16 "sha256"
+echo -e -n $otherinfo | dh_compute_kdf_oi -x $privateid $primeid $lzid 16 "sha256"
 expect_multiline payload "$derived2"
 
 # SHA-224
 
 # XephemCAVS
-private="\x86\x1b\xa2\x59\xab\xa6\xaa\x57\x7d\xe2\x2f\x50\x8e\xcb\xbc\x26"
-private+="\xc5\xac\xfc\xcb\x9e\xa2\x3b\x43\x4d\x6d\x2b\x79"
+private="861ba259aba6aa577de22f508ecbbc26"
+private+="c5acfccb9ea23b434d6d2b79"
 
 # P
-prime="\xa5\xb1\x76\x4e\x13\xc8\x16\x99\xab\xa3\x8f\x0d\xc0\xd1\x5e\x15"
-prime+="\xf5\x0f\xcd\x5c\xf7\xc2\x23\x72\xca\xfc\x5e\xd7\x62\x94\x1b\xd9"
-prime+="\xe0\xfb\x9a\xab\xee\x74\x66\xd2\xc8\x29\xaa\xb0\x31\xdb\x7b\x1b"
-prime+="\x5a\x64\xe6\x8e\xd5\x3b\xaf\xb2\x83\xba\x0f\x01\x8b\xeb\x3e\xdc"
-prime+="\x95\x7f\xe4\x53\xbe\x0d\xaa\xb6\x1b\x32\x28\x76\x3e\x80\x75\x8c"
-prime+="\x6d\x8c\x28\x3c\xf6\x30\xed\xd9\xd7\x0a\x8a\xf3\x30\xdd\x0a\xf6"
-prime+="\xa8\xd5\x94\xc2\x3c\xdd\x24\xc8\xad\x3f\xcf\xea\x41\x75\x77\x72"
-prime+="\xce\xed\x92\x1e\x63\x86\x2f\x24\x6e\x6f\x49\xd8\x74\x7e\x44\xae"
-prime+="\xf0\x1e\x30\x9b\x6d\xcc\x80\xd4\x50\x38\x3b\xb1\xf9\x4d\xd5\x90"
-prime+="\x84\xf8\xe9\x6f\x85\x6e\xc7\xc8\x33\x5e\xdb\x05\x5f\x8e\xc6\xc4"
-prime+="\x81\x52\x0b\x3f\x28\xe8\x0b\x62\x09\xb8\xae\x61\xcc\x86\x0e\x24"
-prime+="\xc8\x22\xb6\x6c\x4f\x97\x80\x49\x93\xbc\xd0\xa9\x72\xb3\x53\x54"
-prime+="\x01\x33\x0e\xbe\x4b\x2e\x92\x3f\x18\x9b\x63\x35\x62\xe4\x68\xeb"
-prime+="\x99\xa4\xbc\x88\xcc\xbf\xf8\xdf\x0f\xd5\xaf\xcf\xe6\xae\x19\x18"
-prime+="\x42\x14\xab\x3f\xef\xb7\xf0\x66\x8b\x8b\x26\x83\xbe\xbd\x56\x51"
-prime+="\xa4\xc6\x38\x43\xb9\xb1\x4b\xc7\x38\xd5\x20\xb1\xb7\x21\x2c\x69"
+prime="a5b1764e13c81699aba38f0dc0d15e15"
+prime+="f50fcd5cf7c22372cafc5ed762941bd9"
+prime+="e0fb9aabee7466d2c829aab031db7b1b"
+prime+="5a64e68ed53bafb283ba0f018beb3edc"
+prime+="957fe453be0daab61b3228763e80758c"
+prime+="6d8c283cf630edd9d70a8af330dd0af6"
+prime+="a8d594c23cdd24c8ad3fcfea41757772"
+prime+="ceed921e63862f246e6f49d8747e44ae"
+prime+="f01e309b6dcc80d450383bb1f94dd590"
+prime+="84f8e96f856ec7c8335edb055f8ec6c4"
+prime+="81520b3f28e80b6209b8ae61cc860e24"
+prime+="c822b66c4f97804993bcd0a972b35354"
+prime+="01330ebe4b2e923f189b633562e468eb"
+prime+="99a4bc88ccbff8df0fd5afcfe6ae1918"
+prime+="4214ab3fefb7f0668b8b2683bebd5651"
+prime+="a4c63843b9b14bc738d520b1b7212c69"
 
 # YephemIUT
-xa="\x17\xd7\x1a\xf4\x35\x3c\x22\x12\x2a\xeb\x2a\x06\x19\xcc\x2c\xf7"
-xa+="\x35\x53\xf2\x8e\x9f\xb1\x91\xfd\xb2\x86\xb1\x15\xb9\xfd\xa8\x66"
-xa+="\x2d\xe5\x17\x3b\x1a\xff\x70\x48\x8d\x9b\xc8\x48\xe5\x37\xd7\xe5"
-xa+="\x02\x16\x49\xd3\x7d\xc7\x8c\x94\x36\x9d\xb9\x0c\x27\x84\xc9\x4d"
-xa+="\x97\x0a\xc9\xb5\xe3\x5e\xfd\x22\xd4\x18\xd3\x1b\x68\xd9\x55\x0b"
-xa+="\xaa\x77\x16\xe9\x8e\xa6\x78\x3b\xb3\xa8\x45\x05\x9f\xba\xa4\xa6"
-xa+="\x72\x0a\x6a\x23\xc5\x6b\xa5\x2b\x4d\x9b\x72\x6e\x00\x68\xe9\xeb"
-xa+="\x4d\x17\x5b\xff\x43\x69\xf3\xd2\xa4\xaf\x66\xee\xcd\x62\xef\x7b"
-xa+="\x23\xc3\x37\xd4\x70\x95\x2b\x17\x67\xc8\xbf\x78\x2f\x0b\x58\xb4"
-xa+="\xfc\x82\x45\xf8\x40\x78\x71\x70\xf4\xb0\xa5\x1b\x5e\xb4\x60\x75"
-xa+="\x8a\xdd\xc9\xf4\x4a\x73\xa3\xf6\x07\x60\x3b\xd3\x50\x73\xd1\xa6"
-xa+="\x9a\x20\x3a\x04\x94\xa8\xc2\x02\x1b\xa0\xda\x1f\x04\x95\xf5\x60"
-xa+="\xc0\xba\x81\x79\x4e\xee\xeb\x82\x5d\x1b\xd3\x43\x16\xa5\x2a\xe1"
-xa+="\xc9\x00\x10\x0c\x0d\x6f\xa0\x25\x46\xed\x7a\x9c\x38\xa6\xa3\x43"
-xa+="\xd6\x86\x59\xee\xb5\x9c\xf3\x81\x04\xa9\x6b\xb2\x5a\x6d\xbb\xf0"
-xa+="\xcb\xc0\xed\xe7\x3a\x7b\xba\x67\x51\x81\xe0\xcd\x2e\x7b\x9f\x89"
+xa="17d71af4353c22122aeb2a0619cc2cf7"
+xa+="3553f28e9fb191fdb286b115b9fda866"
+xa+="2de5173b1aff70488d9bc848e537d7e5"
+xa+="021649d37dc78c94369db90c2784c94d"
+xa+="970ac9b5e35efd22d418d31b68d9550b"
+xa+="aa7716e98ea6783bb3a845059fbaa4a6"
+xa+="720a6a23c56ba52b4d9b726e0068e9eb"
+xa+="4d175bff4369f3d2a4af66eecd62ef7b"
+xa+="23c337d470952b1767c8bf782f0b58b4"
+xa+="fc8245f840787170f4b0a51b5eb46075"
+xa+="8addc9f44a73a3f607603bd35073d1a6"
+xa+="9a203a0494a8c2021ba0da1f0495f560"
+xa+="c0ba81794eeeeb825d1bd34316a52ae1"
+xa+="c900100c0d6fa02546ed7a9c38a6a343"
+xa+="d68659eeb59cf38104a96bb25a6dbbf0"
+xa+="cbc0ede73a7bba675181e0cd2e7b9f89"
 
 # Z
 read -d '' shared <<"EOF"
@@ -237,21 +237,21 @@ f55b9a89 b2d801f1 710333c0 479c5955 b54c8163 83c65ad9 c78b8c67 cc1b211b
 EOF
 
 # OI
-otherinfo="\xa1\xb2\xc3\xd4\xe5\x43\x41\x56\x53\x69\x64\xaa\x27\xe2\x49"
-otherinfo+="\xbf\x0a\x12\x76\x46\x8d\x80\x82\x59\xf3\xb8\xe2\x68\x78\x51"
+otherinfo="a1b2c3d4e5434156536964aa27e249"
+otherinfo+="bf0a1276468d808259f3b8e2687851"
 
 # DKM
 read -d '' derived <<"EOF"
 88bf39c0 08eec33a dc3b4430 054ba262
 EOF
 
-pcreate_key "-e $prime" user dh:prime @s
+create_key -x user dh:prime $prime @s
 expect_keyid primeid
 
-pcreate_key "-e $xa" user dh:xa @s
+create_key -x user dh:xa $xa @s
 expect_keyid xaid
 
-pcreate_key "-e $private" user dh:private @s
+create_key -x user dh:private $private @s
 expect_keyid privateid
 
 marker "COMPUTE DH SHARED SECRET"
@@ -259,7 +259,7 @@ dh_compute $privateid $primeid $xaid
 expect_multiline payload "$shared"
 
 marker "COMPUTE DERIVED KEY FROM DH SHARED SECRET (SHA-224)"
-echo -e -n $otherinfo | dh_compute_kdf_oi $privateid $primeid $xaid 16 "sha224"
+echo -e -n $otherinfo | dh_compute_kdf_oi -x $privateid $primeid $xaid 16 "sha224"
 expect_multiline payload "$derived"
 
 # --- then report the results in the database ---