From 703098aaeb2e3f783fd5e4bda617358457321c94 Mon Sep 17 00:00:00 2001
From: Ciprian Dorin Craciun <ciprian@volution.ro>
Date: Sun, 7 Jan 2024 15:55:10 +0200
Subject: [PATCH] [tests]  Snapshot exchange tests after latest algorithm
 changes.

---
 documentation/tests/_descriptors.txt          | 12 ++++
 ...hange--encrypt--associated-only--empty.txt | 18 ++---
 ...ssociated-only--hello--with-associated.txt | 18 ++---
 ...hange--encrypt--associated-only--hello.txt | 18 ++---
 ...ange--encrypt--associated-only--notice.txt | 68 +++++++++----------
 ...exchange--encrypt--ballast-only--empty.txt | 18 ++---
 ...--ballast-only--hello--with-associated.txt | 18 ++---
 ...exchange--encrypt--ballast-only--hello.txt | 18 ++---
 ...xchange--encrypt--ballast-only--notice.txt | 68 +++++++++----------
 .../exchange--encrypt--loops--none--hello.txt | 13 ++++
 ...xchange--encrypt--loops--with-1--hello.txt | 13 ++++
 ...xchange--encrypt--loops--with-2--hello.txt | 13 ++++
 ...xchange--encrypt--loops--with-3--hello.txt | 13 ++++
 ...xchange--encrypt--loops--with-4--hello.txt | 13 ++++
 .../exchange--encrypt--pin-only--empty.txt    | 18 ++---
 ...rypt--pin-only--hello--with-associated.txt | 18 ++---
 .../exchange--encrypt--pin-only--hello.txt    | 18 ++---
 .../exchange--encrypt--pin-only--notice.txt   | 68 +++++++++----------
 .../exchange--encrypt--secret-only--empty.txt | 18 ++---
 ...t--secret-only--hello--with-associated.txt | 18 ++---
 .../exchange--encrypt--secret-only--hello.txt | 18 ++---
 ...exchange--encrypt--secret-only--notice.txt | 68 +++++++++----------
 .../exchange--encrypt--seed-only--empty.txt   | 18 ++---
 ...ypt--seed-only--hello--with-associated.txt | 18 ++---
 .../exchange--encrypt--seed-only--hello.txt   | 18 ++---
 .../exchange--encrypt--seed-only--notice.txt  | 68 +++++++++----------
 ...xchange--encrypt--ssh-wrap-only--empty.txt | 18 ++---
 ...-ssh-wrap-only--hello--with-associated.txt | 18 ++---
 ...xchange--encrypt--ssh-wrap-only--hello.txt | 18 ++---
 ...change--encrypt--ssh-wrap-only--notice.txt | 68 +++++++++----------
 .../exchange--encrypt--x25519-self--empty.txt | 18 ++---
 ...t--x25519-self--hello--with-associated.txt | 18 ++---
 .../exchange--encrypt--x25519-self--hello.txt | 18 ++---
 ...exchange--encrypt--x25519-self--notice.txt | 68 +++++++++----------
 ...ncrypt--x25519-sender-recipient--empty.txt | 18 ++---
 ...nder-recipient--hello--with-associated.txt | 18 ++---
 ...ncrypt--x25519-sender-recipient--hello.txt | 18 ++---
 ...crypt--x25519-sender-recipient--notice.txt | 68 +++++++++----------
 ...ange--password--associated-only--empty.txt |  2 +-
 ...ssociated-only--hello--with-associated.txt |  2 +-
 ...ange--password--associated-only--hello.txt |  2 +-
 ...nge--password--associated-only--notice.txt |  2 +-
 ...xchange--password--ballast-only--empty.txt |  2 +-
 ...--ballast-only--hello--with-associated.txt |  2 +-
 ...xchange--password--ballast-only--hello.txt |  2 +-
 ...change--password--ballast-only--notice.txt |  2 +-
 ...exchange--password--loops--none--hello.txt |  3 +
 ...change--password--loops--with-1--hello.txt |  3 +
 ...change--password--loops--with-2--hello.txt |  3 +
 ...change--password--loops--with-3--hello.txt |  3 +
 ...change--password--loops--with-4--hello.txt |  3 +
 .../exchange--password--pin-only--empty.txt   |  2 +-
 ...word--pin-only--hello--with-associated.txt |  2 +-
 .../exchange--password--pin-only--hello.txt   |  2 +-
 .../exchange--password--pin-only--notice.txt  |  2 +-
 ...exchange--password--secret-only--empty.txt |  2 +-
 ...d--secret-only--hello--with-associated.txt |  2 +-
 ...exchange--password--secret-only--hello.txt |  2 +-
 ...xchange--password--secret-only--notice.txt |  2 +-
 .../exchange--password--seed-only--empty.txt  |  2 +-
 ...ord--seed-only--hello--with-associated.txt |  2 +-
 .../exchange--password--seed-only--hello.txt  |  2 +-
 .../exchange--password--seed-only--notice.txt |  2 +-
 ...change--password--ssh-wrap-only--empty.txt |  2 +-
 ...-ssh-wrap-only--hello--with-associated.txt |  2 +-
 ...change--password--ssh-wrap-only--hello.txt |  2 +-
 ...hange--password--ssh-wrap-only--notice.txt |  2 +-
 ...exchange--password--x25519-self--empty.txt |  2 +-
 ...d--x25519-self--hello--with-associated.txt |  2 +-
 ...exchange--password--x25519-self--hello.txt |  2 +-
 ...xchange--password--x25519-self--notice.txt |  2 +-
 ...ssword--x25519-sender-recipient--empty.txt |  2 +-
 ...nder-recipient--hello--with-associated.txt |  2 +-
 ...ssword--x25519-sender-recipient--hello.txt |  2 +-
 ...sword--x25519-sender-recipient--notice.txt |  2 +-
 .../tests/exchange--ssh--wrap--empty.txt      |  2 +-
 .../tests/exchange--ssh--wrap--hello.txt      |  2 +-
 .../tests/exchange--ssh--wrap--notice.txt     |  2 +-
 .../tests/tools--help--exchange--decrypt.txt  |  3 +
 .../tests/tools--help--exchange--encrypt.txt  |  3 +
 .../tests/tools--help--exchange--password.txt |  3 +
 81 files changed, 624 insertions(+), 523 deletions(-)
 create mode 100644 documentation/tests/exchange--encrypt--loops--none--hello.txt
 create mode 100644 documentation/tests/exchange--encrypt--loops--with-1--hello.txt
 create mode 100644 documentation/tests/exchange--encrypt--loops--with-2--hello.txt
 create mode 100644 documentation/tests/exchange--encrypt--loops--with-3--hello.txt
 create mode 100644 documentation/tests/exchange--encrypt--loops--with-4--hello.txt
 create mode 100644 documentation/tests/exchange--password--loops--none--hello.txt
 create mode 100644 documentation/tests/exchange--password--loops--with-1--hello.txt
 create mode 100644 documentation/tests/exchange--password--loops--with-2--hello.txt
 create mode 100644 documentation/tests/exchange--password--loops--with-3--hello.txt
 create mode 100644 documentation/tests/exchange--password--loops--with-4--hello.txt

diff --git a/documentation/tests/_descriptors.txt b/documentation/tests/_descriptors.txt
index a19078e..0a2139f 100644
--- a/documentation/tests/_descriptors.txt
+++ b/documentation/tests/_descriptors.txt
@@ -317,6 +317,12 @@ exchange / password / ssh-wrap-only / hello :: exchange password --ssh-wrap ztxw
 exchange / password / ssh-wrap-only / hello / with-associated :: exchange password --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 --associated testing <<< $'hello world!\n'
 exchange / password / ssh-wrap-only / notice :: exchange password --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 < ./notice.txt
 
+exchange / password / loops / none / hello :: exchange password --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / password / loops / with-1 / hello :: exchange password --derivation-loops 1 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / password / loops / with-2 / hello :: exchange password --derivation-loops 2 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / password / loops / with-3 / hello :: exchange password --derivation-loops 3 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / password / loops / with-4 / hello :: exchange password --derivation-loops 4 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+
 
 exchange / encrypt / x25519-self / empty :: exchange encrypt --siv --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m < /dev/null
 exchange / encrypt / x25519-self / hello :: exchange encrypt --siv --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m <<< $'hello world!\n'
@@ -358,6 +364,12 @@ exchange / encrypt / ssh-wrap-only / hello :: exchange encrypt --siv --ssh-wrap
 exchange / encrypt / ssh-wrap-only / hello / with-associated :: exchange encrypt --siv --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 --associated testing <<< $'hello world!\n'
 exchange / encrypt / ssh-wrap-only / notice :: exchange encrypt --siv --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 < ./notice.txt
 
+exchange / encrypt / loops / none / hello :: exchange encrypt --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / encrypt / loops / with-1 / hello :: exchange encrypt --derivation-loops 1 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / encrypt / loops / with-2 / hello :: exchange encrypt --derivation-loops 2 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / encrypt / loops / with-3 / hello :: exchange encrypt --derivation-loops 3 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+exchange / encrypt / loops / with-4 / hello :: exchange encrypt --derivation-loops 4 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx <<< $'hello world!\n'
+
 
 exchange / ssh / wrap / empty :: exchange ssh wrap --key ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 < /dev/null
 exchange / ssh / wrap / hello :: exchange ssh wrap --key ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 <<< $'hello world!\n'
diff --git a/documentation/tests/exchange--encrypt--associated-only--empty.txt b/documentation/tests/exchange--encrypt--associated-only--empty.txt
index 41600aa..3f8576a 100644
--- a/documentation/tests/exchange--encrypt--associated-only--empty.txt
+++ b/documentation/tests/exchange--encrypt--associated-only--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --associated context
 
 
-#1,  2Fy9NoSJgUapu 2TvcB6dXRiSGX 25gtgdTYWdwE9 bNd72FZAYEVN  2RBnssuaaEUX1
-#2,  22VZhyQJvGH17 2u8dwAVsGFaRM 25RWge1pPhPoc 35HNYZKGVfzoE 4N8tkk9U5Hdx
-#3,  Nop1GWuJpKKJ  3coLneTMqEGgM 2bEqEckbxZRnT bR2mtQDr6qTz  PzTiyNJ9KUB9
-#4,  hD3SXSouwa7G  kkgumu3B5VDq  TsbGrHp9cGfD  3nGKNGWTCjK4W 3JfJPQiVY9Arp
-#5,  3Tn6ybEHLvkRX 2P5Cz3qwWBzW6 2UaMcvNKQrd73 2atvHfjjZeGPc 3xeZMdENDV4V2
-#6,  NX7pXe3cDGg1  W81N3QvERESH  2zWCWJVgrsyB7 3PdZKaKdhLuoH pw8ucPTyNkfk
-#7,  gZ4hK5QEbPsJ  3yyaHpNip7oc2 3QQsTg2YJcadQ 2eGQywn9S7Rgp wdUg3simo6PS
-#8,  2Yx74JrGfQ87M Zb9jL4wPAKEK  36o9ANwiZKVM3 Ew5xAx4TDdqD  2xUZJzpDr4iPs
-#9.  3GA5VBkyMPkVo
+#1,  3Lms6mN4tTo6y GphmKn5Ec8Ms  4BR6jN4HuGNJ2 4CV8tQQNeyx3  3rFPYbtMXAk6C
+#2,  xAkFrZKp86x8  jAA8nfPLmF3C  2K2tCYb2C3YKt zgVpvuo1d696  2kkomu89VdpcW
+#3,  6U5K6HaykMnH  3GpCRGF8FXXey 3qGuy8g7JUFAi 2SHKxNzpiTet  3THL8M6RAr4nn
+#4,  bf3iGao6NY3x  273vrRRx1M9N2 tNLMrVTcDMLM  355moqYkBStfH 2t58YTxztyCsL
+#5,  2jw6a2PYS7JU6 3tk11hEzF2aNZ 3ujArJMATYjHS 35Qq4TuZgWRpk ZayjNmG8B7gE
+#6,  dRhioeCVERKJ  3fvy2Tfw6Z15b gsG6iDuWLAwm  43xhJvfYMojed 2pEyetMvk3ghX
+#7,  3GCYRvc8YKH8U 3PWe3AvRsh97i 23pyoCk4rzt2d TDJq47aPvQtK  3mCH8jgCSnUnW
+#8,  ioQTvYMtWjMe  2VHw9hKp4jEow 2PV5z35insNTP 21q3xeHk5dPUv 3BQ2kDyBdSVrH
+#9.  3tZ8hwyeKLvkL
 
diff --git a/documentation/tests/exchange--encrypt--associated-only--hello--with-associated.txt b/documentation/tests/exchange--encrypt--associated-only--hello--with-associated.txt
index d850443..8cc21a8 100644
--- a/documentation/tests/exchange--encrypt--associated-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--associated-only--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --associated context --associated testing
 
 
-#1,  2Fy9NoUTUCyDC SVZpAoZauWkJ  2eWLXDyEvAmEd 24VjiRTBHxoo3 7eyzvLsTHuTh
-#2,  2PfhxhYveUfg9 31EQnWTmzPrHg 3XHEKPyynxKiu 33TToraR2aGe2 3umQpBhvNfTwZ
-#3,  3FFriqorYFbWm 387Dt9Dskn5LF 2BAasqSxwkkZ8 3jVMr3gqWFr1g 2QBhi8vmAjA5d
-#4,  2MW1rA6r46LJt 6QWjETaXgUn4  ugm83t8k7Xs2  2yG8QQnf4WS7r 46La7WT9x135S
-#5,  3bLCrpJTXLyFb DrSnLTs3nFGs  GQKoA88TbCtY  2SPS24d9hMMDn 2a74se22XPSkb
-#6,  3xNJduWkjmAZ8 48UkdN7GTRJuF Gc3RijHvx3hM  b44Gtvt5tHfB  33PSFK8oamTgM
-#7,  2ov69v24A78SW nY6Q9UGVioor  2HR1YJMc2UoYV 2Q2zVkv7aepMe 3Dc72iNGKVBNf
-#8,  toxyVT76gbfd  pdC15NuA5RnE  JdVpEGoebMnU  56F1LagPLLic  3UjvDE2YQ6cKk
-#9.  2tATx7CV6PPXL
+#1,  3Lms6mTM3dfyE 3WgSeD49Pa2RP ijJt3HtBuCKD  2cWHUbHgJJh4P 4Bm2baNpgFpTV
+#2,  44X26AnKxN5eu 3mPzZkc4KxS6H 2g37Zm3uUR5h4 DbUV1LFFBEJx  2pKU4SDxEGu4L
+#3,  b7mJCALMwtXr  3NQ5sjakvKbns 2gsrRjt22UTb2 2JG2cMPdJVxZq 2oL5u6N449VhX
+#4,  3VrdduHR2RHHh 3bkrwYzzyq7tZ 3P3icrUwrxqgh 35Mq8yKSvtoeK 2yGLvdf7agA7w
+#5,  k8qFWvskhvj4  4EhhGYKv2KeSP 6DmRuawySVjz  2GaSdsUuww8tN 22SDhbsfeERs5
+#6,  Hh3HfvyDL7Zg  2Q3Kw3McQJavz 25UYWJNQzSsMp 2px4uFtf25Lrc hxuLFHV5kBZV
+#7,  3jaCetQ91KGkx 4CLkE9zRxy9r  2AW1uskiQRbS2 3DdZhYYYkiQFX 2LSWa7WXQfdXo
+#8,  3TLZ5MQ4DvKaf 2ovZv5pRBmB6X DB7PtbDf6Seq  FG8WYKh9xkbK  2nmKuvXJ3s5Ee
+#9.  uv3fjwrreRJp
 
diff --git a/documentation/tests/exchange--encrypt--associated-only--hello.txt b/documentation/tests/exchange--encrypt--associated-only--hello.txt
index 12d8f47..7b8a4fe 100644
--- a/documentation/tests/exchange--encrypt--associated-only--hello.txt
+++ b/documentation/tests/exchange--encrypt--associated-only--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --associated context
 
 
-#1,  2Fy9NoZyhwmKP 27BUb9mAKaJpK 3wDUa8eYAiUMc 469XWbyyeuW4W 2Gru6j66Z4t5g
-#2,  2dTbA4cEyyeqD 2tQFo8mv4QvS8 RKAnCHzRVJby  2stJ2eJVHrggq 23NggHM2zs5hZ
-#3,  3ujcBRt4JHJPu Rjfb4LCVuX7n  YUoTv9zyDPtM  3E7WjbydmoZ6s 2GCfNJxQrCtQV
-#4,  2um2Kr1RSLDWf 37S3SAaj4LkE3 c7sFd8utg4Rp  FAtFp8fd4YiA  PvoopiGTBthz
-#5,  2BJTqZrvZ6qrf F26yU5Gjb2xt  26AqB3YcjGqku bxjpSwrE67Zg  2QMmLiCRsjvJ6
-#6,  3PkgTYAYZ8txZ 43s3dUSDHhh4Q GkAZf9QhHoUY  3MR83vNC6Jx8q 3nWzWdxrfiBpA
-#7,  3VgsqyZsQXHdH 49iG9KRyvcPxN CT7GQ9fA5CeE  2itq15qK7W4BA 3nPKEZdL7NxGw
-#8,  3LjtreidMtjbc TLtft2hbuz4Y  2WzGg85sa6vBb 3gs73Dkwph7TA 2CF3r8ZWsPjVy
-#9.  2Wh2FkYCnjKA3
+#1,  3Lms6m67YCsj7 3CShVYmVRMosv 2X4vnf4VLeAnS 2kZAxKCAMMY2a 258N25SUbVmCR
+#2,  BTVPsJKtdx5f  2m5QEdypjn9EW ax5vEx5ATTFH  2A7mDF63TRzon 2iSn8go8wyAzZ
+#3,  3yfm9mz75JWve 4E1r7AUQyoLDR 45852hDoG8P5i Avq1i959hXVz  3uJaVQQFJ5mxi
+#4,  3VYfQ4TdLTNyx 37nauKkzBxkCh 9TaQjZ8tTjwc  3RQ4wUUpM2d77 FYPQ5JA3yMFF
+#5,  3JcED7bCvcA4m 3AAfFTUVDjyqU 3uZpKs21dQb5B 3wyhX3R4mwTSx 2q4AxVXs4AFcT
+#6,  CcmVCKwDC5hw  HXFPYj5oUc5h  27TMQ7ePEyhGc 2yZU2X4LVGWx2 2iiKgeX3eJ3Et
+#7,  3KdzFKo7qChH5 24rh5rrSco4q6 24WSvFTYbe5w5 2VJD3R6XQSMFq 3a3vF8E1miHVV
+#8,  N4ebQBcTJ9at  hmwucvjosz3T  2R9h2cgxtig2z 3NZfwFRSkhv1w 2Kcapp4qHstjf
+#9.  3pA8VAzF8QAcH
 
diff --git a/documentation/tests/exchange--encrypt--associated-only--notice.txt b/documentation/tests/exchange--encrypt--associated-only--notice.txt
index 41916a5..db3d6bd 100644
--- a/documentation/tests/exchange--encrypt--associated-only--notice.txt
+++ b/documentation/tests/exchange--encrypt--associated-only--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --associated context
 
 
-#01,  2Fy9NoZUm2NyH 1CiMNvs22jBT  3w8xzt8pcwA1h 3NVXJLdsusd8M 4EWQbnGT5VCiE
-#02,  3erBj2D342rNh 22JQjnGzUNmLn 2PB9Dp599wtMi 2Mgrnkw1TnXZq 2CzVdqThVkajB
-#03,  2jW8MZqTCcTFp 4D9YK8JR4HD4R 2ms6pQmeMhzcd 4DJdNeoRordA4 v6AZJPn4QvyL
-#04,  1PXtdmSdch6Z  3Z9vzSdMRcRuG dpYbNxqz1U3t  2TBvjrvmZ2yLH 3Kj75as2qm5Eg
-#05,  38DtgxNW92sYe 4w6qeR27cHb5  MWy3argeXtRn  3iXmMVj414mLN 2UyjfDrHb7PiT
-#06,  3pyqu1mvWu7N7 KG3CWVLVZVr5  2tQHLTCQUe7B6 32aUVdEfZpG8e 2ocXFQ1Z2J2St
-#07,  3yNEEAGLocrnf 461YCk437v37B 3XoeMenL2cuTp 2uSwEzFer7qUE 2YobYYRtiyzz2
-#08,  2kqaDdWdrYgW  2E4nzwoftHXK5 1hD5EtXZhXG6  3icKJDwYMSA6C KKFhPW8vdFxU
-#09,  MyoFmFNjbwCq  vF5oX1kzeg2o  2aoh6s1Ab4X92 Mafu6WgeEZ3r  3mw6bAzgsgV85
-#10,  41NXSVgda68LT 3w6VqHABYqAwU 3YUdmasmjmA3f 3RFaH4Q1x3Yhd 3NHXs6mGGqjFW
-#11,  2ijZm6X9wHa1A 2H47u7yCetobJ 41kEeSH72hfuQ 2Qpf2jsJ1mCDp HDSHD8E7UQCb
-#12,  9iiU1rgkncye  jKziJwycwS7w  3ZBxERDLycH9p zF6JPPC4i6WD  2NaNPW439zCDn
-#13,  3ELgqqHcdymwc 2LV14T29Dj8xp 2FNmUUrryKCes 3HudnjjyedY6s 3ion8Pm9Cp4PQ
-#14,  F26atvTjoEEd  2TBVsr5ADp19Z 22q9fNdsFMEgN 48q4gKAmWpGt7 2QoNgKiNhEzr
-#15,  24wkP6uCZyqic 3KoTubN3HfU9n 48xYNta5xEKbb 49LQSzuKzmXYb PmYD9Q8uJvMo
-#16,  4CukdZhsiNiqN 47JfCvxqXLVHv 4AgpKYsoXcHkC 3hYSyDGpMxPaa 36txQqEMiBjVy
-#17,  4CPfyRzCafKeg 2sGgCZ36sAUCa Rc9JknkDmGXx  cT8W3cAhAAND  uBNVaafLP9xn
-#18,  3pSgp6st1suKg 2sjZ2tkfJKHVT 2bj8epLQMnD6t DcTpcesAcVqY  kQ2XRqZ7wVP3
-#19,  XhHGq8XKnEY3  37r5sGGKWgcEF P7MZwa4i8XF3  3HN1n5swG4LKE 2uzV2aBk6SZgJ
-#20,  4BffErwgUsniC 3X5H6xCYkk4zC 33WUNC1Ccv9yY DMtqhGi7DTeF  2A5Za9pJ4TU4S
+#01,  3Lms6mJcsA2BC 3jxRny1gaAdTq 2ie2FCK3FWUaJ 4C8puGMi7oUGa 3xxDmQUFfAKms
+#02,  3YJBXtPprLxAk N15qtduYAWpN  2VEs11XFL8MR7 3EokUyYJv2GGP 3nBVynBwezPAU
+#03,  2KbjPr2881dCZ kSwRJbAQ26W4  2fieFmu8zxtpK 3wqxJGSERzQNs 3nZENeUe6mvs1
+#04,  2bB8rGuxNTdzn 2HNzbPTav1ysP 2Ar2pCZfhHDxL 348QvQnYmPXzZ 3UnCwnkbFdsPg
+#05,  3AH1udPUYBVLZ 3Pb7Zwnk1FTwF 3V9nCavZksicP kVDeWrryncx1  38Dk7aTH3TLvT
+#06,  sZcqXaWgJA1K  48JteUfx1zFmL 2wv3VqULpRfei 2gPQHKbtwmQn6 kvWEUyGyFKjg
+#07,  XNwm7yBCAmY3  2r1FHrMZy8u6z 2H2wdR1bWDMXa 3aGGbt78XaZfT 3i7qgQStqLucW
+#08,  wvTKvrwMwF3d  3XzBDZtPThgJ3 4ACQzCuESLo5j 3Uw3dHaA6ssMC 3AHUtiESYZdc5
+#09,  42TC1BWVnvAy5 qk6AKzm6X6yn  3wjud9QHY3cA  3RVCwuLa9Vdsb 3BPXetJXrNNfw
+#10,  GgAoYRFo51cC  ayjhmbDYQUN8  LSHparvqHa7a  7JEY18FaKXMd  2X94EaLNryAxi
+#11,  2Hp9M9rhnQ1Fs 27cN4n34mDUad 3ctMWPS1Fa8LS 2RJNAjh8uBRMy VrrBSuC6harn
+#12,  e2M71jFKZySQ  2byvxK9nQUuFH rLHeVW2Wnhaz  3LxjPX7u54TN4 3iJd2AvzDpRAg
+#13,  2aSa55UPDDPUM kJQCY114b1Zr  AxPBCtFaNHNf  yhesNaKHnXmt  ERtUgkKaxYJb
+#14,  43rdwVvgcnWXz 33shdKu1Tbdnp 2giCQR8JmWu8X 2jY3fin9upxri FVdCrpEPTogA
+#15,  2YsZt14THrXgv 49evagAAFGPbx 2pGE8hxSMiSAh 2MaLFs1A6ZZgg 3355Xnepa1PeW
+#16,  3NYUqq8arbQEM 21Nxfj3mqhAo9 3cYpQZiaxq4mk 3NnvPWMVygMnn Rwr3GqmWA92L
+#17,  PUnEoxvuWzFT  kPvYSxAtCXEx  ZBLLttqQ23KF  2RU26zT9XwUUw 8TEmUctm4rqi
+#18,  3Evy8cnmmzYqD 2kuHdnWMQrNmb 3m2Q1C5kW9LjB 3K7cGp4hFGSBP 3jbn1e3iWwQE4
+#19,  47P9mmcHa27kf 2HTQj6GYyNPQq qD82ExZKmSwN  21DMGGVW7ie3T MDbZYKB1TLU8
+#20,  7tesBWLqJigA  LgqL7Da2kGvg  2PitQWyDyAduF 2e4MCp7yDEvUS 29ukYo1dRfxnD
 
-#21,  2GPpBo1qPoG8d 28WuhkhpEc9h4 ncqHabjZFFx3  3Gyxt8scM95Hb 3HGEE1n9ZKLAW
-#22,  3gpfc8CDaynks 2YbygpFcqPdxv 3Yb8SYdPmbuWT 464CmpPW2UcNc PY4svVqK77gF
-#23,  41ucwY8abVawh 33JpEGxkRKAok ZNnXVqrLbG6i  3wribi4c9GdAF RWa8U5gf24s4
-#24,  Tr7hxA3Zz3so  Uyoe1PvRyDsS  2ENn3Qk642iu4 3T6Mh8SKy86kL 3t134Nx7vPjBF
-#25,  2n3VVvyxvz2VQ 3x586NFWtQZMu 3XTMWqNYwkL6v 3gXSENGL8wcF7 bVRV41odGUuK
-#26,  2SswzARP9TaJv 2rDXsGDYBsLHY 27V5KGeCNsaMi 26StMYVQxbdPk eMdcMYi99Utv
-#27,  3w7raUtcEycq8 3V1Yi3c8nmEkg 3kEyCkHsCYCRW 37MBqzAt4F3DR 3pvPSMdVXesu5
-#28,  NXzV5jsZp1kC  2y93SFdeip98v 2yV3EvyaPsTij E1vzeWr2RPcV  3HD96fqhf8RFw
-#29,  2p5RbvhyuLqqv S5SWF8PF6LYV  JZFe3UxbmsVC  2duAmCNxdqiwj 26KbRR28Fjhpd
-#30,  22dSgJhdkDPyr 2J4ztfwxBtcMe S926Vs2H3wGn  sWuxCKxyned7  3TtXdiSbPpeAJ
-#31,  2dHR7GShu3bDf nppfxouT2rdE  2QgR2iQk1EEHH S1dQw7fQvDfH  29QmnBXRfJgK5
-#32,  3adxzKShxL1ck 3Ds5Jv6LVCgjo WYNz5Mt9hmNF  UmzWjXiGroB3  vnniJ3Xy8QD7
-#33,  svTt36iJKQaa  2b6ptmVwTHXRh Hv4ctH1jFRG8  3TJx2YwwL6R4L 2DTJq6YVD9dTn
-#34.  2p95HYE2SYXQf 26EozfRJrbBXm 22K9J9As4j9xA 2uovZJeLS9JU9
+#21,  3SsqEQpeLbsXP 3Bide3GUFZ6Mq 2mQ7RgYf41T4g 3HZ4UTYw6mJiQ 41jxHJny8dXc9
+#22,  41AmiKvGTQWSQ 3LTofXj2GQJQW 2V6xmDDrumNZt 2yHRpfkVboZqp 3zmWiovN4NF9j
+#23,  LVsHno9HPfL5  421WhkgHhmezM 2CyBcg8u1zEiB 2sgdmbpGwtfFv 2uBqg9T9E8LjZ
+#24,  2w77CANVpphBh 2d5ebHYm5aMbw 3pnVvkZ1oiipY uPM4HDvGiY9j  3qxK7bgGDdL7F
+#25,  REFDxkW6ZR9w  2Zg27uatkp2oc 3bow7pBG9Raf6 36dA7KHtYAHZk KGNcodAhjwMk
+#26,  w1PQUCdtKghn  s6fhgdAUFh8W  8G7BokCjjfsC  2xG3SBV6pe18o gGk5k82iSurP
+#27,  2771h9Wmrvd9h iWPzbS5N7zLq  42iSdGuMNetPw 2EB5QmgGqykXw 3mpBioTDVYxF6
+#28,  2sgeQWWSzpEBn 2EsYPM75d4RLy 3THLgKRd6UgDA xTJkBRZNMYod  EsKPANDjKkub
+#29,  VWarKRtujVat  2Xq9H4nnjFF53 iNXiD4Y57Gva  3zD2SUEE7wVJe xkWf1p9Qdhs1
+#30,  3s3GhMTkTHceQ 294TR25xLgM9h 3zPiJqnmEyznT rjeP1zYMoR9t  hLHzMTRMSJTJ
+#31,  2yeLZXBLBveK3 CVYF5VG1AW8g  2C824D4PGhpex 42AHcTXfbAF8s 2P1NmQXpHGzuZ
+#32,  2aRSbGoNk291d 3ADqZfyNDA7Sy 2aejXZJHMttBn 4CsiNhkPNjoPv 7inhjFf9YT8Y
+#33,  3zQCgVEDqe76o 3sk4sfFDo1WJu 4DhEiv1DbzSiv RWCRKBYrT2pt  VxGejV6qx7H1
+#34.  242mVQdamMNed 2sWPnZUsXm4yY 2oPzoZzvnznRZ 3oEhMf3PYgjjq
 
diff --git a/documentation/tests/exchange--encrypt--ballast-only--empty.txt b/documentation/tests/exchange--encrypt--ballast-only--empty.txt
index 518d9f5..1e8961a 100644
--- a/documentation/tests/exchange--encrypt--ballast-only--empty.txt
+++ b/documentation/tests/exchange--encrypt--ballast-only--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348
 
 
-#1,  2Fy9NoH5QAnp3 FcMZTQzZfpWT  pqcwC78faY3C  2JotwA5Q26sGi 3BkXLoAWJFGTH
-#2,  26o5xmMU1ih4x pcLjR7cdts8T  2pMJgmAwaxSn5 42jNvc9vFG2Dp FK6Rk85EWMb8
-#3,  3FVpSLj2JjvCn 2kSXsMPxmQAtB SKVimejc7zqY  3b8yXfL81mPbo 45U4QS1duwUVK
-#4,  gk8uQAPGFFNC  3UDMwY63QsUdn 2o8gqUCTmRhq9 3xyr4GYqhdJGK bF931MAniSmz
-#5,  3NLPw5ZM24zS8 3Y4jU9rXYJaRn 3MQ91cSPVGnZW BXwBdrwQz2xF  7595pvV6sSm4
-#6,  wdvRmKi4jyb3  2Nr8Gk7dyFE8z 3rishv1k4Wx87 6eQzPoFLTE3K  3uQiQdU25yaR
-#7,  MWEpTospbcwf  ZrA9arYGdd8z  iupJe5jxSuRU  yTq1xZ8jkouD  2qKrDP6wmEtBY
-#8,  vaD9CBgD3YXr  2m42WyXyC2Zka 33gBGyK9XH9Ty pn91AS2JY3T1  3J7N8nkPWDozS
-#9.  3Kc98A3Wr79hi
+#1,  3Lms6mLg15t6C Z7LweAJoFycA  35v8pG8scCny4 f4oaJZAEvuen  3h9wLnpp3xAk9
+#2,  oezCbgeKmKSe  3TtSHfyECvZja i9X8UuCfPjk3  29JYyh76eZkTQ 2NDvT5itCKf8J
+#3,  W72YQbxFsXwF  QaeagyVQySto  3VwRM3hamezvb 2VKnNmMvjqMss 2XS6PazkKynz3
+#4,  ExGEQLBuo86H  26eAsbPtcD8rr 3vYgkDgpuTDxU UfSRsKg1qbyH  2RQJdkHvvLxHy
+#5,  2ACqmc6dRGh27 E3RaHaRCbh1C  3ZVxpoYgxSxUv 2xjRfo7gSwacg 2SzMUzuK8C5ew
+#6,  2vhMWE4SBaoCb XjVKJDPE3jDK  3ASmzHQ8714y1 3fCSjohwnHwtE 3KG84UHaZRz1U
+#7,  23z7UKAgja1fA jX99zgjk3gVw  2dP6yoNfUWtA  2Q44i2MVzVkBU 211Bk16KgHhfW
+#8,  3w5CNpKiUMDnH 23TMtA42DwSi2 2tcWuDiuzmSxo 2F9KyVPoBL6QD 3HEKPbwgJg8sH
+#9.  3YBsZvGbwgHDk
 
diff --git a/documentation/tests/exchange--encrypt--ballast-only--hello--with-associated.txt b/documentation/tests/exchange--encrypt--ballast-only--hello--with-associated.txt
index 3358134..c1a23dc 100644
--- a/documentation/tests/exchange--encrypt--ballast-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--ballast-only--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348 --associated testing
 
 
-#1,  2Fy9NoYBj4MK7 3abimUkotfrjB PsKUt8c977UB  3aJwW5e6vDC9R 35xtbwM4NqgxR
-#2,  3JcnkiRKmA2FW 3ACMCcNM6XNdJ 24DCjm6wjhwAZ 3owUTkwMvuWBL TKxZa7ZEXonz
-#3,  M5oaVEyV6ctp  X1ATFaxt7N6t  SDJYDf1MdmMT  24GDFRj2x5Vwf 98ozx3Q7pcvx
-#4,  2R5qYmJ5V1u69 2k3ZpqU5f4JTZ QnJEwBeEJfx6  nHmEtaCP6FxM  3HzragDTdX5Gs
-#5,  z3dsTY1yjCsN  2TLxWdzWY6v64 3WYNokodXfGbn 4E8m5FtkuxXdW 2AvghasPXNrRZ
-#6,  2eaSHWgPZ4AJL 25dR7zTWEXjZQ Y6WyQW1eXBZn  45eZ8o2apYbed 3q88BwjCUPvGv
-#7,  rBs1EUyLdh1o  3eEKY7FXenbNT 2R83iRdZH221u znR4Fe5eAdmM  2SHN9ia8TJCc2
-#8,  3es2k7xNuHXTK 3JxjKBLh9SrMb 2wZAt6XT69b4Z 3YKbZ6jVhyiAj jTEwwRwuSw7p
-#9.  ZgXLMNDLWYx3
+#1,  3Lms6mUB58NxX 3oy11h1hvSAw  2WsYkkgZ2iU2g 1SKi2YPTebjR  435gQeqB7Yow1
+#2,  2nQZnkrN2kKxN tVUmp69Ca3zy  2ncbZkbQtBCd7 cE8DioH9RFf1  3dsLwesB4TGfz
+#3,  2DA7PeVtjCebR aoXue8JTKBmr  3vzW4F3F2YaE9 mycjG6ZbpSiB  36vbUxWVLvfTr
+#4,  46bhvxkqXVNF9 9S7FyX5hntTH  28pD4ewezJqeL 2AFMvhrKe4TSC qDuBdhEW2Edw
+#5,  ezvR4AtLvp1B  34LcR38vrzEtn 2eyde1PWagWrY 35ni8BQenHdYk 2k6WMjdbHMQxL
+#6,  2vjpQzcHL6YwD WFUasS8cCYsH  3ZC6eRHh7vvW  2Z9H6va1k3xpU 3SZHadGDuvxZc
+#7,  3zeTVpRddRnoe 38wwqCkmhBjSe 41Hk92Dx8dWuz 42u4s8ZKxcVWX 2de1E46oi6QnW
+#8,  3M9Ru4kZh1q5s 3NCJJmfyodwq4 ZE8YQ1Tw8bdk  2695PJxB6sKkz 3bV2bWrAdWnZa
+#9.  FxC3s6qmK2GJ
 
diff --git a/documentation/tests/exchange--encrypt--ballast-only--hello.txt b/documentation/tests/exchange--encrypt--ballast-only--hello.txt
index 2511baf..32ed413 100644
--- a/documentation/tests/exchange--encrypt--ballast-only--hello.txt
+++ b/documentation/tests/exchange--encrypt--ballast-only--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348
 
 
-#1,  2Fy9NobHY4pFN 2c17Pfj6qoDKA 3dS6oQdnCxsnb 3hk2S23HadMXt UppF2CdyH1UM
-#2,  oYSc2d4H28cU  2PeS2ix1CUAxu Bgw4ug2qZfch  2e9jSWSFxRfjo ehnwfYFMmAaq
-#3,  3jazKuAVS6Mh  u2eBtD8LDb7V  2CXWmhDamiReL 2p6UnN3pKD4Vg 3Naazo4XHE7jf
-#4,  tC1rr5ZM2Wfw  2EB5EcUEYutw5 3qFRDp34D9nj8 eX7Y3f9ecqij  36WkUzLGqTxYc
-#5,  PZ5o1sQuQUYj  yqxR1dDyPimB  DMfso8648J6r  aQy83Pormv4y  qtQA1RtBXCrG
-#6,  2u7s1vdhLjAHi 31fiyusdJPn4U 2QB3vu8oeeTRR 1FJtk8BwFnBa  28xjN2rUXFfh7
-#7,  BtwWAUbzrqce  3d3tGGLwcNUUK 3K8UtkcUEmbQ2 2vWXcKfXn9Pjn 16sfvrz5Pb6N
-#8,  qqVLVHow8jQw  3rPPZVqiLQnJW 2SD5Bjb9LQdeH V5X1YxzNCd7i  f8GazqhuB3oT
-#9.  27QHbkbZysaC3
+#1,  3Lms6mEcyCyur 3EAVxR2PffAKM 3SAeuM2PbbVpK 2R2zo8hrH4Q5J 39ibXhAtZPgaw
+#2,  QciuNBzvNz5X  vd41CBxY5BsG  4DCMQSQFWK1L2 49DLRi3qV7srN 3ns8F6VXivku1
+#3,  ZGuhQg5FoFa2  TectXZ9Nj6qE  3sVAeX2tpdUNA 38BiX32bJkCxq 3gVwKwtwmfrcn
+#4,  3VKuT8yYmpdxQ 3E1fmbNEwACxA 9VsRZZHSXzva  SUBn9egQb9Cw  HbgU2obNHvhG
+#5,  36tajsWXNpan5 2Mz9t4ZNByvBT 2bj45a3RhMcGd E8xSD2ZmX1hM  3n6iH3LHVVm4Q
+#6,  3pmzVq27zc1ub 3T1k5KQBcehk8 4EBBXCZUNeDhn yH2Ns8sqqD4w  3YYGARHkBHxri
+#7,  3kTer7nSLskzk NGySEANQdLwA  2CvayA1NADzXJ 2exMgUfAxLnAE 3efBZdy8jw8xp
+#8,  rUTSGd2CWifX  2viq2E8WCF9Lu WpK1hZAgwiys  3voer22yWh9xi zJpoatcMMG4F
+#9.  zSNBDr886FvV
 
diff --git a/documentation/tests/exchange--encrypt--ballast-only--notice.txt b/documentation/tests/exchange--encrypt--ballast-only--notice.txt
index eefd35b..2e3e19e 100644
--- a/documentation/tests/exchange--encrypt--ballast-only--notice.txt
+++ b/documentation/tests/exchange--encrypt--ballast-only--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348
 
 
-#01,  2Fy9NoVcTJMKJ RZ9P6mA33cBG  3mmqhPriAVcHH Ut8EMrLuTbNk  RdEVv3fUzxkb
-#02,  2HKKmMdWbUdfN Jj3cTyiZB1vf  E8tJmWU7XYgo  3MxfJUxyDQnMw nrinN7yVZS2U
-#03,  3acXhCytsmUV6 2R1RaZyZTwM5A 7UwNwj2PLmuk  oxghuZWSeUqq  3MK3rzzguWppA
-#04,  3fDZu5MzZLUGS U7WviJikP2Qz  2xGP3CaLGtAo8 3hHSvEVzVC3tf 3qea8M2JrNioS
-#05,  33Hpxs1L3mYB9 DwjRKA7PJTGb  5x6hAfxRnCpC  4AEd1akbHGbNh k38iKAmcuh67
-#06,  3BmkJSrmoX8tu jrMfEfgYE2Me  dQcmq9q9sygt  3p2BFEGMVv65F 2j2xy4AtjCrwX
-#07,  4DYKYbZdyq33T 31U6K6P9nDcKu 2qdfxqVRcBFMm dfoneYrdeZyD  3rrBm7EpdH3Mi
-#08,  2q4PeNDDe7YGh vWUjvQysYPn8  2tvoY8dyXA3SP 3Y5Zt1Y6aoBkR 2mwXon2uHYhho
-#09,  2Rag8bxkTrLFX 4zbmJoZbsqak  3VEvs557vDdPz Y2EPanL4ryZC  2bcinoaV5NTRJ
-#10,  3kDf2E3YQGz5e 25CUYLFMAzsKu 21MZh9gWKb8tm 3tTbccHeb3PKC 3Q1WREXBohujP
-#11,  45o8L4tU1nq4P 3reTqN5BtTp9y rdHB3re22HUt  2JVdFFVMAmxg2 3i1ooNocapfYu
-#12,  2zjezKsHpaVUA 3eHcUvCdtAFAX dNLGAuUawwhD  3orMRx9wCn4J9 2o9Nkcx92D2CL
-#13,  2DEuu81qWEYUj unWoRQa5YNr7  bNwEWJdZApd7  6g5LCKHVmcr7  xAhtR9pmtaiY
-#14,  Td8SPY9hrdKN  FQ4wUSBZ6Zq3  25taD2o2wcVa6 2ksJh3mWBeYng Xfj3pAfD9s5n
-#15,  3PvEZRd4LayE  2PCn1js4tGck1 2AzogARZAFgaz 2AjG9k2jz5xzV W67mGnmYwJtb
-#16,  21oStCZZSSBgb fcf3EQeD4h7g  47kwbw2iuWHBm 2J3nPgRz8nur9 3AG6cYz6w75iY
-#17,  282gsXaVFiM5E 2W99EVNmbCo5U 2FfGjWFMRNpik ar82Rnh2VcRS  2ihYWUaF3esrG
-#18,  j8zupfkD4Bk7  3B5ZBQcS4fznA 3721L4HgXhYju 3iBTqnFGtu672 3Ltp9NiNksnf5
-#19,  3NW6XR5qmdBH9 4Risr4nNtajr  3eyysugLC9M97 3BmuRuamxX81a 3V7rhz7kufWuW
-#20,  3St4cBc6M7BET gk99Uuh8dPrX  4A8mg7nT7ERjs NERvH5fGN9VT  2RFe2BbZsnCXW
+#01,  3Lms6mJgthxSN 9WqijyEpGN7M  2BmztSeNYPiyL 3b3DYvQdRq77p 3uoiEPifBMXfL
+#02,  2Addyam97R2oN 2dLFVWnt5zfDk 2daXTTJaVPGXx 36T78EUBevogB 2VsGMmCkfcvKc
+#03,  2191UPKRZz9YM Z7NyKQnM6tJU  2fzuzWk4WTgqX 3HYm7WYx998No 2EwcJAi2aRHo
+#04,  MNKBbVNiPFiH  qD8r3zFM9beA  YTfrcnkiT5nK  2TBqNSH3EiYjU 3sNESxnGPZBN3
+#05,  2CQdGCk6ma5wW 2UZUNF3inMsqe 28d8xdfVqp7as 41T7Fqyogibfu 4FbnMWtNfworU
+#06,  3h9gz1Vwj6oyC 2HyKYzAN3ZF5k 3ayMS1eCESiss 3qhCNBKFxhizF 38qx3EJzEZVVd
+#07,  xxMv87Vu7jRM  3nFoHqYcs84fA 3mXenBoPnxnN1 K63UwPLtHN7A  xBcaQmwZfs4x
+#08,  2XZ85zSf69Rq5 2i2NntjyPhoyi 2XpNGYy61o5TT 3pr4UkBWY88zE 2vqQwaHjCPXc3
+#09,  2uTWLLP6NQ2xu 3hH9VQhoAHHE5 454MkzHyWNVNJ 2i8C4A9QMDHCJ 2Sp8csoPwzC8X
+#10,  9uyLQQHy1csY  3dzJksd71LKvU 2ijLbc3zp84bk 2tPae9ZvUJAQ3 3h3qVxnAwc1Tm
+#11,  3zkbC2Jx44ehW 2C2a3AvcqWkyR 38e5n6B3YdsZA DeJv65mBygKL  2rX6Cg4FAqH4A
+#12,  2NkBcDQjmmhwG 2RshGxtrBmG8m 23sXggzXJZUx5 2AkZQDpNMsrzN 31pY7iuJWVzsm
+#13,  dSUrFEYJ4pgh  mVioFHoEkkTU  zcTfo7YHXQ7A  2ZTKAyn91oUSF 3qdmaLM8S9XCv
+#14,  GJJArka14pAB  3yHiY5LwXJmsu 3ReQLHGiPC4Qc bvHYK6YHcbyk  QCvUEWthA2zP
+#15,  29NFfATUAJWj9 3FwVRwD99J5AK 3dRpxXvBaGu3v 3fQn69dqDiwUc 3BDNW87YP4By8
+#16,  3BDugTbxYK2nc 3mqsqmKTs2Yan 3Bv9TLqF9pHd1 3Ci6Kgo1UWnM5 3C4LtDSjRrW5J
+#17,  2zoATpiv5g7aC sLwqnKaiZ8z2  6pyEmPj5UQum  33sCX1DkUSZoq NCUbPkYiApDJ
+#18,  2zoFmBW2GVAW1 4F6tEvWn6CbPe 2A2Y3X4NVD9P4 2eiRQA2sKvpsn 2n3We7X3kGxSB
+#19,  mTKc1drE6BSn  3L7CohA8vGd8J 2jZVfeeWtteDW 2Yw6PYM9svHVj HzHWm1nk7mFx
+#20,  2qBPRvxMYjWKz 3SF93ynCBXyZB 2ESVxVx6q59HE 2vA3nzrBbF4s7 p6EJKuHf1onS
 
-#21,  3YV7ftZVkaAro 2UuZ8VD4NU8T9 ZS5riy2ooZBz  39sXhS73CRYri zV2mSd8x6Set
-#22,  4BQY77i24G5g8 wSEE4xjZbB8A  NPnP2DvQE9kB  3x4FUc2t2ydFv 4527BJLbxjbGg
-#23,  UcoGq1xDagur  xYyoN4FkWQ4T  2omnd5rV4TDrp Y1zsxssyL8ws  2j4MZ127t78QR
-#24,  uYAtxXjeebf9  3J7dcGZsMtQFu 21Xa1rBvq6HiF aLAvwMPLh7hC  jz9WqPRZDRK7
-#25,  2gUwgKiCeaCvc WJ4mEuEusBtT  SJ1WsQpoQHqc  r64m75gQFueg  fXTNKuWvfBSg
-#26,  3CDohtMFzwWnF 3ScFKccZHYit8 2d2qg5ZVqPgKt 41k6RTc3QNVrc 46ca62afMfNAv
-#27,  GpkaepYhwGsA  3uffpdyJ9akgb UrZaRHhTyTEz  3B9e8DoCr43S  2GkqMF9atR8oj
-#28,  2vKwA5B5YJxV  2gNXaWbgjbYLL 3XGidnsbXQ5Wf 26iXSfgEHAgnM WurF5DowbQid
-#29,  3LYfmyMFJRTyA 3z9pWbFpPnPkL 328YT1n83WzTa 47bPcahio5ow3 2MaMpANUvovxp
-#30,  2E6zHttGvGKNS 44fQvjNm7b1ea 3MduVrDo8f3ey 3isR7gKM9SGPJ 3qkNQkRf45nkm
-#31,  3BgTr1kZFNVjw 43p5yrZ8YHUui 2DZDCe2qGVRtm qsMTvo15oLqs  3Yxzmd4KML6Ax
-#32,  2qZWVwPowzpLa CngPd7dsGRvd  2ncSTRSh9XwRj pxNsfih78mdb  2db9VE7zXN3T
-#33,  45cpYWromzKZ7 31fXKQ4kAXS75 3XJ6GECbTkbB  i27mUeJEsKhr  3xyZysnhUANuo
-#34.  3JqjoAu6H83by 3XcGMHS7Bfpk9 kTNczUGytDgN  21LNep3GJwF4v
+#21,  2jgdUMBJtZafE 3YRZT3BUGHi9a 273o3Sq3aVPAk 27jb5riwBtH1u 2VzKP1Ba8BJw7
+#22,  31HCca69BeJst 2EvHnotiY2Ajc 42VtVukLMTBun 3kULpf5an1nVR 2WhrYrrmrKDxM
+#23,  44giFXrzyC93J 2eRvFWKS1LoPA 3y8kDDR5Bfx8w 3NynZDsvLzm87 23gfgu9pFmbdQ
+#24,  21a8pHdvp2dSY 3G96SKSerRUWG GEZEvXZ857Yt  3e3sXHfpDVKpD 2Pyqdvvr2coyK
+#25,  9dbhnx9e7M4v  48dbPjFWu4AcG 3xH7XgXQWwrGt 72CRVHuJwxbM  3ggYrT1edfkrJ
+#26,  QiufGWxWBxAt  2aCo1cV3qDy8Q 3Njx8eA81QMmT 25cFe3zi3xsSc 3XDsat5bfNPy6
+#27,  36w6mxhM9x67S 49tFf7zbt9QLG 2enT6HX3suHJN Fo9VHbbjnjuH  CuAinXVNtTzS
+#28,  2qPzD69A8ZZyN VuuLYBBtUAb8  3nhyBvP52XrAE S8y2EDPCfWhj  3Hj4GKCtm7gPr
+#29,  TUhLNPc92Dfm  xzL7p1aNS2XL  nmMXMJPC7Beg  3aeFS6UYBKCL4 3Jn7H9d3F3BsP
+#30,  3iFEHoX9Jf8pL gKX7dR31otMU  2byWMdtEpn2sB jV9rFpCcJ7h5  3eCyK3gfBTJKD
+#31,  24jhXYnV9Wdct UPrgavBfroLC  46XDTiRVNuRLd uebFYSa9yrsH  3NKo1sSAgRApg
+#32,  473SFM6cZkior 3kxLUNh55uqSm KQ2w2m2pxBKc  45BHE99pwQMV  2bib6e562oDJY
+#33,  4WSRCaZFethD  2r65VbnsqgnaK EMoCzipip5ti  3Ah27s5NWfhDR 2ondr1Rvujj7J
+#34.  NCX1ESfHhTvF  jvZv3Cbobie   2cEssi3CnB84X NC7mYpDUpQ6L
 
diff --git a/documentation/tests/exchange--encrypt--loops--none--hello.txt b/documentation/tests/exchange--encrypt--loops--none--hello.txt
new file mode 100644
index 0000000..8975aef
--- /dev/null
+++ b/documentation/tests/exchange--encrypt--loops--none--hello.txt
@@ -0,0 +1,13 @@
+>>  z-tokens exchange encrypt --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+
+#1,  3Lms6mZ3BW6dt 27qScQdFab9qx 2xak1A27JUHxb 3EsiWf13D4SC4 4FTzaM49ofR4c
+#2,  2PjzMtqJWnkax 47W47V5BZpmwm 49LdyAAtMr5jz PCNHkvgH9shb  5FHSZaYo9AF8
+#3,  2TEYveaD62vVL 2EHSQ72bKfCR2 48q1N6c2nT9Un 2nXccPvkxKuf7 bsY4NJkSAj1v
+#4,  3efYGtRZPCUnZ 28HN2CsH2XcKH 2MURorNQQevFZ 7mmyE1EpgTSk  41F6JusXAGbNs
+#5,  325U8ZUmXU1qT 2zcDQhGVhXCwp 3dpFrLiAyMXUo 4Ewp6EHtyZZga 3H1kmHDAKX6Z5
+#6,  G4DWLcyFoxJt  BqCidGqD23f8  2qwFgNGZyyNUe 4PYCB56DYZWe  3VtdXNjQ7AjXE
+#7,  2Bmph6mdVmUR  3ZSqDi14srZ8e 34VoRkkgvSa2g F5gPbU2uk6of  3aFUAxiTxSvoY
+#8,  eFNz2xx3akyi  8aa2zoKc1QbL  49jTAQQSHH5Ez 2Y69Ns5QLnVei 3uiJnUkjsvcyR
+#9.  2sKZSy2bTf5s5
+
diff --git a/documentation/tests/exchange--encrypt--loops--with-1--hello.txt b/documentation/tests/exchange--encrypt--loops--with-1--hello.txt
new file mode 100644
index 0000000..f91a9f5
--- /dev/null
+++ b/documentation/tests/exchange--encrypt--loops--with-1--hello.txt
@@ -0,0 +1,13 @@
+>>  z-tokens exchange encrypt --derivation-loops 1 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+
+#1,  3Lms6mZ3BW6dt 27qScQdFab9qx 2xak1A27JUHxb 3EsiWf13D4SC4 4FTzaM49ofR4c
+#2,  2PjzMtqJWnkax 47W47V5BZpmwm 49LdyAAtMr5jz PCNHkvgH9shb  5FHSZaYo9AF8
+#3,  2TEYveaD62vVL 2EHSQ72bKfCR2 48q1N6c2nT9Un 2nXccPvkxKuf7 bsY4NJkSAj1v
+#4,  3efYGtRZPCUnZ 28HN2CsH2XcKH 2MURorNQQevFZ 7mmyE1EpgTSk  41F6JusXAGbNs
+#5,  325U8ZUmXU1qT 2zcDQhGVhXCwp 3dpFrLiAyMXUo 4Ewp6EHtyZZga 3H1kmHDAKX6Z5
+#6,  G4DWLcyFoxJt  BqCidGqD23f8  2qwFgNGZyyNUe 4PYCB56DYZWe  3VtdXNjQ7AjXE
+#7,  2Bmph6mdVmUR  3ZSqDi14srZ8e 34VoRkkgvSa2g F5gPbU2uk6of  3aFUAxiTxSvoY
+#8,  eFNz2xx3akyi  8aa2zoKc1QbL  49jTAQQSHH5Ez 2Y69Ns5QLnVei 3uiJnUkjsvcyR
+#9.  2sKZSy2bTf5s5
+
diff --git a/documentation/tests/exchange--encrypt--loops--with-2--hello.txt b/documentation/tests/exchange--encrypt--loops--with-2--hello.txt
new file mode 100644
index 0000000..8f8308c
--- /dev/null
+++ b/documentation/tests/exchange--encrypt--loops--with-2--hello.txt
@@ -0,0 +1,13 @@
+>>  z-tokens exchange encrypt --derivation-loops 2 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+
+#1,  3Lms6mJ1j9a1x 34zqKLm2sfc6p 2LikZraCnJAcE 9HFkWi2qnqmF  UsimDrtrysfA
+#2,  2RCWW6cm6t8Eb 42YjKocpY2WhW ZMhMNBULKBRm  3J1CfPp4edZis oXiZnPbisJyR
+#3,  3EBxaLcqXVvWb 3eA24ZVeoNqic qQ8vHuwxjWdg  2y9A19cB8p4Kk teZRY17L4dNk
+#4,  44VAntKGnS5S8 3VmgoFcTiH1iX 2HUtsqyE8TN3q 2Q6gcxpTZRkWC 3Gc17PGF7Z1N9
+#5,  2ES5kdGtgYvk3 3PETTcqZEBHNA vsFaWF2RWTur  psoyJBiofqKJ  3bRh831fAM892
+#6,  3aks9sjD1c5Hr mHaZ8aoD7YxQ  2MPBZdyZee6BA 41zyUJdj7mEML 41JrPBLFr5YFW
+#7,  2agxBTUVbQYCX 2vDZbxwuGyYeW 36JHZ59FuxYjc RBRScEQ7EPEG  2F6XdLvQvZZK8
+#8,  3zknCd1PH9KMk 2ipRAmnryHimU 2FzsyfRBPqWQy 3xrZpe3XjzLkT 3yDQuAZcULj1z
+#9.  2Gd4gb4AJoYUv
+
diff --git a/documentation/tests/exchange--encrypt--loops--with-3--hello.txt b/documentation/tests/exchange--encrypt--loops--with-3--hello.txt
new file mode 100644
index 0000000..8582ea0
--- /dev/null
+++ b/documentation/tests/exchange--encrypt--loops--with-3--hello.txt
@@ -0,0 +1,13 @@
+>>  z-tokens exchange encrypt --derivation-loops 3 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+
+#1,  3Lms6mBjZLod5 3CbiUDWjYn7mC 4BoVZSCN4JubT 2vvc21fQ8UkhR 2B8pchP6LA2B7
+#2,  vfS9WpR4tpCV  2wjPEyTF7vrbo QtRCDyTc9Gsr  2Nbu3Jn72kNU2 2DL196KWbeatF
+#3,  3cYSLZBgkmAZt 2QzJfopkdKJMr 42WY5oUkcfdAL p5cn7kySQdQP  y4CVS1fn7fg1
+#4,  npB41h8bnMs2  2bnK1B83UaJxY 2QQL9aifXVNQX 2qv6xkD6onZw2 32TTakj4Kyffs
+#5,  42wVmuSvgymD  2WuNJEfvqp84X 28cbCnPDu2bk3 2o9K55o4LTkbz 3RLayCa7GdiKV
+#6,  3iMX69Ri9qgMb 46SQKzPcqnbHq kQ4zEsydk3Jm  2czhCvKgc2pd2 2PkaQUshBZFnN
+#7,  3nsz7tM2naYsS 3o2Zqx2uhZN3F 2E4v9wMX3XuHN 4EyqhyYaoCnWf 2e91KR7iDM8Tr
+#8,  3E8dLqprGbL9T dXvF5VfNgDoE  435FztuUSFbaE 3fWs8T7NzfXNf 2xXvoaLbLxXN2
+#9.  3DNV5ZAzLscJQ
+
diff --git a/documentation/tests/exchange--encrypt--loops--with-4--hello.txt b/documentation/tests/exchange--encrypt--loops--with-4--hello.txt
new file mode 100644
index 0000000..92971b0
--- /dev/null
+++ b/documentation/tests/exchange--encrypt--loops--with-4--hello.txt
@@ -0,0 +1,13 @@
+>>  z-tokens exchange encrypt --derivation-loops 4 --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+
+#1,  3Lms6m61BZM9o ai2514tocjUU  HJYTiDEBjug9  A24yhuyzhb5N  3LBP96VRzrm3o
+#2,  Hm2JquTWgpXS  xo3H6u82oT3d  46J96vpfofhGm oRRLxdbKxipj  3nsbs1ApNaZWF
+#3,  cTcpmunmxa4Z  2ozHkFRasG6B5 2V5Xo6F5JDqMm 4AXT8FZ1LRrnk 2sShwKPci3q3C
+#4,  3xBSvPLYn58Uz 24roaVmjhjTV  46AxVHeVwMDec 2PkcCSMU69gqn nKxRhurWxrLk
+#5,  MtAVBqhksdUc  3LaZMsHcW4z2W fKeCTm8wHZ4N  3bNMY6f6Z2ZSd 2H8DUDR7Pzmqj
+#6,  3vthBnQexCDnX 2K32wrFtnZEho 3e7MszqaXxEQ2 qXF7H36WCios  3qvd6sz1Ag1rV
+#7,  ZkXQbYxSCcTa  NhdEjWkoBgH9  1NNBbpwxUJ3P  42oZZvT2aKq3q 6V51frDGw1Jp
+#8,  2HDx4zqnG34ex 3gkZmfVb4cEHX 2ZuwGkYkN9miF 2NwWZhVnwv79T 3esSaGc2RVj6o
+#9.  G1VAeBJLpb8S
+
diff --git a/documentation/tests/exchange--encrypt--pin-only--empty.txt b/documentation/tests/exchange--encrypt--pin-only--empty.txt
index e10909b..6dd357e 100644
--- a/documentation/tests/exchange--encrypt--pin-only--empty.txt
+++ b/documentation/tests/exchange--encrypt--pin-only--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --pin 1234
 
 
-#1,  2Fy9NoEHzqefV 29ewUrdovGUha 229gqsmaAo2o2 2hnNNusNC3Huh fgqhP5q3PiaT
-#2,  pMtSCE6esjBG  3MSVDNtuKSHrb 3omU8p3oEFjb  2CD98b5A1Cw4A 3oAH2aHUhQFPA
-#3,  ErkTccBChrSG  2Px4rhrF9sReY 3idqC5Eaz6FWT 3pPojJY9igquf fRFu4MxCmoiF
-#4,  44osXs8GgSi6T 3kErbZMofHUhf aA9WeBgTCA9e  2DJYChSNefGQY 44obuPP4hVQSF
-#5,  2GzX9uYV7VPmd yXeJwWV36Qr4  3rUVVVjjsVYFG 3F34c5FTwsvqD 3t73zzW5VD9Hi
-#6,  2aNx71kH33JeL 44foxdFepZCfL 9DLMV7kUuTPc  2PBahBGPcoJxH 68RUDY8u9DPN
-#7,  5chNs9aNboar  3av5ykidCbYqH GAtCHHjeNFDb  2Sm44JJ9BYNeg 2J6MfLeAmgf7U
-#8,  29wSxMXFcA5DL ghxmEBdPN1x4  2HB95XoZEibty 3b8791hFp74nf 2hj1fugKzdDhq
-#9.  2cNdnyGy38YVD
+#1,  3Lms6mADcHb1Z 3aaQ8iX8M4PEA 3qfBAUw5hT7bK 3Tz1qox4sXcsm 47uqu2fCbWCRm
+#2,  F7MSfMeFWkfz  2bNWEFufDtbUW 2fcCKuUajm24g 2iYn596zhSstW 42YGDLr41a2BT
+#3,  25NdM1mS9RMT8 3gcq4k4ycTrRA 3Zfm7TG8nt615 3SibT1DpqtpHq 371L5GH4iKACY
+#4,  bCdxZ4veASYc  21yP1DJEuQpNA 3dkBpPHLD9KrN 2P3aiyAnde9eo 2RJ5mCY2ibohD
+#5,  2vRWdXp2yukcs 8VJCE1QUJAD6  2DYbyLSTtwSfb 2z4FHonKUnBo  37p7Rmew6WdjS
+#6,  VFJAsGMGsnnZ  nKcVyhwkQJ4d  3B1ytaP6QafUE 2oxdDidzCtsy1 26nAeqnSBgC2Q
+#7,  c9Y6oqA4AGYi  3qQodFXQVinnM 2cfmVdQ2ETSx2 2Ju6uGdWX5aRj rzckFVap4AuG
+#8,  G8td25bThp5N  BbTyiK6Hv694  fHyzik2CUUMJ  2p2cA7a3X8jHK 29ckbh2hXvYsw
+#9.  1YuxrpAYeyjx
 
diff --git a/documentation/tests/exchange--encrypt--pin-only--hello--with-associated.txt b/documentation/tests/exchange--encrypt--pin-only--hello--with-associated.txt
index 2a7cad3..9c89f98 100644
--- a/documentation/tests/exchange--encrypt--pin-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--pin-only--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --pin 1234 --associated testing
 
 
-#1,  2Fy9NoVGu8ZqG TdchqEC4YtEc  3TDz4p1V3xSqD 2UefvF2LBhoe4 6U2uvXExpZBm
-#2,  5dqh6YcoPiFx  2sU6X6d2ERhYV 2u2YF5XE5dBhu 3bWe4j4cJZBKE 6udR4dM72kXV
-#3,  3ai87zhmJtmRz TNKW7tym8Dwi  2H5fzzRBGK1Uc 2ZyBGoFzhQ7ym 2daaPsSznrkU6
-#4,  2vYvYoRUweeZU 2fkkBHTWRd1cS 21WkyNBuBX4Ye 2ypPzyTrG8HZG 3WQkeDVkKcuYW
-#5,  3kG8Wa6yKRUmV 2AVy3zmKfjWHa 47NDR5zW5bPjV 3J9sMhWaWyEKU 2ZYyCBsJHDoe2
-#6,  7w8Mnvt2JRFb  aSiW7cPPEiA3  41y7vSbwe9e6n 2MhtfM5PVnysZ 2XH7jZDJF4KPs
-#7,  eQvmTP1B8hpy  2wrjuHjSJXJCo CsBZTEvHtk5n  vq1kqsFUuNTr  4DSsJKFDxzFi9
-#8,  SnV7tayY5njb  25qxon35usBSv 3P4h1mZmHshny 39XxXnoMM8PCT 2eajMiPXfMUd4
-#9.  12RJAkQN8Muy
+#1,  3Lms6mScn9THw 2FP39DGHHPugN 2DtrWX2vaoJhr 3mdZMd9zQXjjA vhRVrvyU7ePc
+#2,  4Epid67S5cX5G 2ouqvCpfosyRB 2wTb3hoDxCpwM uXxUbTVoBvBv  3jE2uvnReckG1
+#3,  2WSnsZJLVmTJ1 2Pna8suuyHiSy 35qWQXK8UJ1Aa 49C3qk4QDRQzG 3zjdpe3Hvk2S7
+#4,  3C8mvkug5FJXY 3B3sieTGgUdRr 42jNaeccV9JKY 2fZX7kb6eWrtx zqetwWpHXmHr
+#5,  aPQspMiAsE6P  2iuYSR6nmhWQk 47vaqN2qQck5J 2d4KsbifxqUiW juUHmfGBJBNZ
+#6,  3fKK1qnNarSSh 2EQmhCxzYpyFi 2JGhqgCswmEig 2wErH59DNR4bf 2XPL81MrRTNBZ
+#7,  igosefMj3Jgt  3QojCDnSmyQNW 3KobKFXrMdgck 4AELRGnwrNqWF 3r6iqpes3Pyti
+#8,  hjdgTXWCmGKp  2uTUdwGMhQkoz 2cBsWNhysNLfs 3wvW8A84FEXSH 3gzJQURQ36LZS
+#9.  3hNfs7eYmJGW5
 
diff --git a/documentation/tests/exchange--encrypt--pin-only--hello.txt b/documentation/tests/exchange--encrypt--pin-only--hello.txt
index 96e1b5c..726be57 100644
--- a/documentation/tests/exchange--encrypt--pin-only--hello.txt
+++ b/documentation/tests/exchange--encrypt--pin-only--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --pin 1234
 
 
-#1,  2Fy9NoEUGh1jY XFowZcGUwSJJ  3EoNZWYuvXPep 67cwY4irRuDx  2QcSMCADQrNjP
-#2,  2TnoDau9ZHTGZ CbiQPRWcHX1y  3kCJX1je1rtqn 2KjMgkCcUAa5E 2FvuFmo7rwpXF
-#3,  38ecoHCyrajTU 2NPvFHM1t1mxS 38ASd2qM2Jccx 49dCYhDkt4jbb 2kq2jP3vrMevx
-#4,  3iSczFNrksSp  45cdWxi8ZFS7V 6PPt8KmrhTyo  2YcMfizC3Ar5R 3UewrzHuJVjCf
-#5,  2mBfYdJccT8PL 3obfk1qGvyPAT 2C278tMKwjND9 2N3hsmjdi49nL 3r6HRXVDVubGm
-#6,  3brxzxASLKgx2 3aVRgJcrVGiii vnpQePMSWSEe  3QB94CD2tP87P 3XhKeye7LwFHC
-#7,  3Wm2Jc1bqdQ3h 3ZSwnZdR1Ng8p GQSHPe2jzoLB  3MGwPJiZxg3R  2M6CVnjwXTWZz
-#8,  xz8igM5AbBse  4BnkLTbn1w5vU 28bC7DrvwcaXC 2q4ZmBf4gBVus 2X3pktgkymRoS
-#9.  yWSMgtqzLThB
+#1,  3Lms6mKuTiPMo 284bSRdRWJyHV 2iJju7UuXmzmZ 278EBFkUr9hBX 2qqox8Go9hUh
+#2,  3T8pue2CRmNLa 2E1PBtSbvis8j qMAaoLMePkYG  3w5vVTsr3Jai5 2NC9HK73Bhidn
+#3,  2b9pxjb7u7X2w 2hjUGd1MJzCAv 24mQeYfKfES4  4C6agusnrrEV2 2Z6E244pePVK2
+#4,  2HYihnse2nffA 3xkQ4mBnk2TFz Nkcfi7CSCB8r  2Dfjj1zJp8BsH 2APJVtnyiNYpt
+#5,  fZGhJv2axQo3  2H9aGK6WP7FEE 2fWMUYNCkVWCh 3r8KFNcq7EKu7 4DqUPz1XuXgrJ
+#6,  2JTBFTpWmVfbV 2CXYBokKszom5 KGHvPBYjzz5W  3obLD1b9xuEpY 38qv43anJmYN6
+#7,  3252DPQxNxH3W QfuZN2CoFDFy  22frLNJZGKjrH 2sN18yFxoTCvj 2WopXHiiGnLkD
+#8,  3E7fNneuDFSs  3PwUX1vsn67xo 9YUwEkfv7ajX  2HfbdTNsSfd5e 3mCGU2A9QuFke
+#9.  28cXN1VWoL9Lz
 
diff --git a/documentation/tests/exchange--encrypt--pin-only--notice.txt b/documentation/tests/exchange--encrypt--pin-only--notice.txt
index 35887d4..86e5526 100644
--- a/documentation/tests/exchange--encrypt--pin-only--notice.txt
+++ b/documentation/tests/exchange--encrypt--pin-only--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --pin 1234
 
 
-#01,  2Fy9NoduCqYFF Af5VtgwiKKUk  2gQgV1xj6qY3a RmXbFM822Bzr  cwSt7iezePJn
-#02,  3seHb3FmeAkz7 2W9tmNrifdpHQ XB6A8Cgaz7Bo  3jwYjn4UJ8VXr 3wa8LMMYjWkw6
-#03,  478MtjmnaUMHa qw7JHnVTjEHZ  45SSrzoy7SaLy u1AtWvn8Qw4g  2Y3cBvam7KH3o
-#04,  23r8eVWAVa9ax 3GeXQVQ8tK6s  UpzuWTffzjf1  314p47BBPTrHo fMUJTd7EdWSW
-#05,  27KesKZDgSJZ4 3ZPcPUkpvxZie 32WpkGt4LUAsF 32cKyJcEvrtnr 4EBsCMFdx2VXV
-#06,  Z4GDPD2tzmba  3afs7WiP1K1MU 2F2DwZ3sh6L2  3dPrpvxgnYwLJ H4Hxzx2JorUa
-#07,  pBJHArB9fB8p  3qL6fNh2bSskw 3QCZAKzVtdVCb 31jf6jc6LQKrW 42hxq4hNkEoDe
-#08,  2oC6n27xorEsA na4c5FRnGKXQ  8i5mrAFEspKQ  SF7VhhxdoqH8  2HT95n816ZQao
-#09,  3m6GpLfjDEsuF 4BxD7TQqtYniY 2FFBpwCETTM6P U7R97JKkZeBY  SfZ4R5s6NYQg
-#10,  3ESnsBQzpY28o VxntkGnepCm8  ngEbG1R5QKZS  3iVT6DteSvwsF 3PmW9VqeUQmmy
-#11,  3WyYGbyrvsS7d GXw8sQFJ9VEh  3EGP3bG4vbLTa 3hMtRFbj3QqwX MacaewicHa3G
-#12,  46EswD7dHcJRA 4AWk63pXs1WdU 27YADneBfCGgd 2cqBQp968qzW8 46Kj7NqR3Fj9W
-#13,  3UEL7n4fAScfX 2t97qmw1XkCfo 2uRP576UTFjbM 3AWujviPEPrAd 2vPhZRrNsUiBy
-#14,  33qtt86cwddbo VCg8yVC86Mjq  22V9kowusMLQW 2GVRiacRXBTik 2TVQ13zrmoR3y
-#15,  3k8XvAhZkd5Q9 46RE678cwTqA3 2ykGgQ7YbmSVK 35dTWZzHyNqeS 3gftRTaUQi26V
-#16,  hLwdC3ZtRBbf  JsgNfjznyAWi  2w5waVjhsk9f4 utReeeMQNa5b  2X7frhFpwwS1u
-#17,  3LB7ayWc5k6Ka 3iUM5XVejGkqf 3uaQS8FBTUrK4 2AFPfvLGHFsdC 3MtdT6C8ueFZa
-#18,  mctL9QHWmx6t  3RtER2mxBnAvB 2X1GGHvyMGfBe 3mkREquKxeP7m 2NuvM72Lb8W8q
-#19,  3o5SCAqnGSeSy 2vUCUdndekrtT 7qz2L5SWG2F1  VLRAAWxNQ7jo  dhmxKyPmNPDW
-#20,  2E14Fh9aS2htX 2HYAMjpXb4Ugk 3e4Fa12XpwnAA 3jc1hkiLA4vDN 5iSoakihuuRm
+#01,  3Lms6mME1h8Yd 2wqeNW9wLMMnH 2KPxMmnwWZN75 GRYHr1UmceBc  3PB1Vd3KNYuJ6
+#02,  2uXKqBeZFNw2o 3LXPvh8sAVjpv a3FGDuYASDRW  QTDWeJiDKFmQ  R1hQDnT6DR78
+#03,  bWtnKV5vHkBu  21Ag39kYFzBR6 ADkp7jNQGnYF  36mdDqzq6ihp1 29vsV4Lp6cYns
+#04,  5rSNgj3foDLj  VUuczodqJ395  3vbM3fW8LZBnQ n1yyt5TeZDfU  q1sTyyB1z4uc
+#05,  3Zjfa98fZRvcP 2xYKAZLfkFyNe 3mGTCsdcTwHns 42tvifro2in3h z23g1EtcpjZA
+#06,  2kJFNbHZqfnvh 2pLJcPNqw5jJo eJ1hNWgvkonU  2A52NS3cGR7gc 34EmRj94GFF9W
+#07,  3NfjRD6oz9tpA g6r6CZDa56fP  3NuCANHnc4XCU 23pn7uzFdqbpK 3eeCx1CnKP6vG
+#08,  2RVVxR1DcL2Tj 2Ehb6GNUM7kdb vmThMoC1KTp6  3eMpE5UExsfAX UysU8jJhsScU
+#09,  3nUYqg8JPFViR 3PYr2goNy3E3h 3YKw8r1FYhQZa 3gFzXFZR9mvLb GJz6k6JRF3wg
+#10,  48xEUpfCCHU5E 4F1dcL7v8VyZV 2Zn3PetnskPSs 3WMsqWaFfXeWy W4jixEc1XcYv
+#11,  e2U8UwqhoFw1  TKRkyhoGgF2G  3fUeoUoDpTiZF 2dKFzHNi2jBpi 3s5ZWwNxChg1T
+#12,  4CBU6S7UtNcnw 3JeK6UCBrY5EY uZLrb6ySTLUK  pkXJBHQf9VXh  AmJe23hdu1MR
+#13,  ui7MYEVPqm9u  3QMdtyAaoJfvX 2F8CFzGDGweho YtmjQuUcKa3s  BUYG9PgRL38k
+#14,  2bi7MaUpgbnTX 2i6zcsNtoqdFP Ta4X4Y1xHeWn  2N3hmPhrAnQMK FQXgwicPQtwS
+#15,  2PgFwNwcNhHG6 2ymiTmASfWpgS 7WeXAwxWUe1y  4EZ2chh6kQhpX fJ53YdSHBs1i
+#16,  2XfCF2BNoXG47 qnnrHcSYZjjg  3EpnXqiCg3ecs 2Z6Sogpbu2qmy 2iNytLqnGxtL4
+#17,  Nvq8WEgbzFhG  pLtrWGp5yPcH  45FNvdRY8CvjR 284WfBVNaPgkf RbGTNugd8mcd
+#18,  23d3XE9deFVQo tZyCkqsPtE9G  2ZzaK11nL3jUb 3PYTLRsfjT895 2pVav2mQNVGfA
+#19,  3NjTSR16eG4mn 3NKwwy9iREWKg 2N6aBnyanbDVF 37EUFLKiKbQcz 2pshVUuzXzzNH
+#20,  35kRuJrsJPxGE 2ELfymCUH3GbK 3hGcxgAphY9Xj 3yB1br3PBMsbG 2SSkHoAw3MsDZ
 
-#21,  2jjBdM6P4LWjV Spz1wKHqsS9L  89DHNFydoTe7  48CpwkhCEaTTU 2mKG699gVPU4B
-#22,  3UFH1j8wPiwf4 7oR56Mgjd8Hn  2fmT4a2xLwVvb 3CvDTHfBdo1S  3UfDYtJvvQVi
-#23,  2FxpaEAEwMd8x 3RWvSeQKtfRZb 5MxUXTehA62E  2XR6h75ZubJ21 JB7mtSaHsoXZ
-#24,  EiemF8E83wfh  8Eg4CQCx6tVd  3vEbugaZ5kvm5 4qAtzG1AsuRz  2DkwdEfrxry3b
-#25,  2yhMJmFRw3AVN 6ArumSffVExb  45gEUJ5snVRQ2 4AnWmEMvtvTex 3KDvHpZqSYLt5
-#26,  3buvm92o5e63g 3i7tXV5xaWHsn 2Qe6VHWBBsqBS 2rP5JHwpKSj5R y4gXFuCbyXnf
-#27,  45t9GWLVnRrT8 4EX8K5NyzfX7Q 43ULMkDuAZc3H 3MaSz8WxZHT1P 1aWGsnmXtcQu
-#28,  GoEddSdiRtCx  3V6gN72i3gkXJ 2cHj1M8HxJS5U 4FXeS6bwvYhi9 3X9DEXDSjtozo
-#29,  BLEDd8ehytkP  3Hx68o3hc3vBt ATyDsTyspks7  TzVnukYtfyfG  27hmtRNtiraYv
-#30,  45iE9rT5QdaB1 24Ec5ox1iW81F 2bVPezXPyYn3X 3WMWq92N9QKWp snkxs1Mk6SV
-#31,  3RofMR6m8ToCE 3kBRroEekZBAP 25BUgqNmpTmKn 3aDZQLcF8z5Ec 29BwNFpLEQqVF
-#32,  2e7ZhR7KpMMnv 4UDLcxE1eXCj  2NEdYnyrXWpYa tp3tfYWVkc71  2iRafvC1tQtAf
-#33,  292qntz8mUW6u 126g2t635Brg  cLnnSHTrB2iY  2Mnt3Mcq9Vsmi NeXYwr5f6tue
-#34.  Td51FotFsbm1  3VDvZArTqykRL AyDqiQ2f1xWN  35X8ccrkJzswg
+#21,  21i5e2JttakL5 4FjFBhqs6Mh7f 2pqr857o4nBaR 2WAd7WtA1iNch aKz9QRv9YtSb
+#22,  275S1WwCVPsdX 3xcSrnbY4iMyk 3JvG4WJ3mcrYX 2d1fxdFfWNByx 8e2oWyZ9MxMr
+#23,  22eaZKY8ZwkpY MaJLWzTSvABg  3WLTVZxemssSH 3DiXctc1vnbLZ 3xw4c8UCvnMdB
+#24,  2GG32KpUzvcm9 ZQek2xWTu2NY  3JJTBkCYAErSg jngLXCwZi19W  eDtKugRXG8br
+#25,  334MWFDR6EZpJ 2SXgebofovHxn 442UkgBZBgfuf 2GiYKmbuxTBok 2mf75kg62897q
+#26,  h3VhrMdHHH8E  3TgYLGFL8AY4k 3JhH1LuCiUJji 1PDNuqXuLMU8  2LUautAZiP1gL
+#27,  3eKF1YjWHf17S TpYt2N9RhgCn  24xvqVjyLjTEv 3RJZ7FuYcd9vz BhL7cejy5r3Z
+#28,  7zBKsDtwG4wK  3YLXf4mcVgMYa 39nFGjZtFFQpt NK84QE4hCDV9  tCQJPUwfjREu
+#29,  43WMXBLfrZodd 2rYpR1dyBq1EC PQrBerre2fKX  365xkzADjZzMp 2LcpHMsg57qZP
+#30,  2XbPHDJ3X1smA 2Tip8eW6tu9fB 2Wf3gbK8G4N9p 34U8MeMBgVeq1 3MbHQpW996Xi1
+#31,  5RHwwvDvxvMD  mAD4ciUb6xwT  2EUksP7FnUVXd dxtmJSdsHA6f  bxymkr3gsJeY
+#32,  SJZtMTDwFsf8  3FHfXprZryAGr 2h4dLikfkipV1 2waEchsmGHyAY 4E3hvwKucEmKM
+#33,  QNah6nsoMSJT  3iQGZ3pEzJ528 3AitvWhfJmv9u 3G1CMVgZhtkQZ 2pY4AQpWwFZvw
+#34.  VfcL2vgWykDy  8poLpXZJJng8  3tGaahXhCcBwT 3WGNfnYB2tY2a
 
diff --git a/documentation/tests/exchange--encrypt--secret-only--empty.txt b/documentation/tests/exchange--encrypt--secret-only--empty.txt
index 26ca762..0b585d8 100644
--- a/documentation/tests/exchange--encrypt--secret-only--empty.txt
+++ b/documentation/tests/exchange--encrypt--secret-only--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm
 
 
-#1,  2Fy9NoAiaYgG2 2p73izMWQWdxR 6Dom5c14JWoz  JDJQ74XUrAbG  45xkhX5LUX14H
-#2,  dzPyMKmFtNXd  2qDQAFCYV37bB 2maKF7noMdBc6 2KgdD2acqQqCK 43icAotLLukSh
-#3,  GFMzvurc2oSA  2aiFYKPmfbScn M14RJh6Q4CcS  3hQL8fgeHWym1 qNCHpMyMFwFt
-#4,  3SDqxtez8P1ui y7roFG4RQwyn  2apAHPhBG8qyG 3aVKUgfc28yXV oMmPEwnXhj1G
-#5,  2G1Kccpe6kM92 3kPukmn9MakxJ 3iAMjCLYHt6i  HW44W6u5pRNA  42g54izWh7d8N
-#6,  2zBe2oUaWptbg 4DUAapRM1U9G6 3qi432hYkWZxn 3bKhKr5SR8r6R 3yBxKrdEAjb9E
-#7,  2Fb1bkYXMR1EY 3fL2jwys6yAXU bePQEuxmtysy  44u3ZHkAZSDcu 2i7YrnE7FWMZT
-#8,  3BceyoX6tszG4 2SGf8V5HCR8BM 2F7YuxZcwA32p 41vzdZxD2Y3mc 4hn1uvTrmMp8
-#9.  pKpEWP5EReeE
+#1,  3Lms6m9gqe49y 2J5jcELQwVFsw 3BdVhBvv83XFG 3HZd8ZYqM7R7W 47GwL5q29zZYn
+#2,  2p3hkv12bz2cP 46uqyhJZMJhno 2XkNvCB5NLF3B 3RLt51sSRUCpi 3Byr4wjfM49yu
+#3,  2EpSHFPYzHSZr 3vDfj8Qnb6XW3 TuHW9tuoohpF  2TkivLyAQPUG1 317dJwYjPz1MK
+#4,  2fBJ7ibZ9Cumq 3EzYfmkqGQWrT WbgByZEs6qB9  4CFsqhJX5Fy3C 2awPm59XjG5oj
+#5,  3XVm3Vm4uA2zu 381BuXRq1zvb8 2nuzUATWFGX4V 2GuRKrBGLwsuv 3CQGVwubbJvCc
+#6,  2nXkr5m7ofJL  3HUEtvqGMJbsi 4ECdnQ8MNy2Zm 3EFojCKM2aYW8 MrqWqj5zE4mh
+#7,  3M4KP4zkVr9PP Hujz42VLKpEt  2VdqMczqEorX6 34eP643SZ89TL 23bMRHvw3cxJ9
+#8,  3DeP9x2r8ua12 4Dij8PFzgzmYi 3uGW4TpcemUcT 3eLnVSVSUrm6W 2aPiwWTjGC7ff
+#9.  UN975DF3WhGS
 
diff --git a/documentation/tests/exchange--encrypt--secret-only--hello--with-associated.txt b/documentation/tests/exchange--encrypt--secret-only--hello--with-associated.txt
index f1829ae..cdba5e0 100644
--- a/documentation/tests/exchange--encrypt--secret-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--secret-only--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm --associated testing
 
 
-#1,  2Fy9NocytHshd 2cq8StDjtkzAS G13TLizioXDG  pao2GahFumDP  2aGVWbor69tEV
-#2,  xdG5ZX9Gr114  2gWQFLgv4Xjhq 4EBGYPnpnaEkZ 3866pLF36bqFk 3r6JgmCsrVGTT
-#3,  LeDJAmoHqizL  2K1VqEubx8pvw 3fk41UkJYnAvk 3tSL9ZDiJq2qA By6X5YWWX6kM
-#4,  3kMAw5G4sgZNu 34oUfJdsU1mYz 2imgi2KZ79C8b krhLuYvXZsjr  KRVCjMDjJCpQ
-#5,  42N6zGPTbabht 3EPQEtGUFDfU6 433X3EFoi23uW 444ZuMn8sJNRF 37Wfo8mZDMHVa
-#6,  46GPxjUdhoWP3 3Exkju5sypSFU VnCKzF87mYcu  3EjizCokBqRwj 3dJ9ERK8NnjvA
-#7,  2Utg8p9hEfBkx 4EyeyA7Pg26v7 fz4YxLZJqVVS  44HqfyxTSvZKp v1JKYcbZsQU1
-#8,  2NpTtJAeQGFoQ 2PgfidDx8n5Ez 2x8fjrZ1YG4u2 ShrkyR8LzFzx  3C4VA8LraZFx6
-#9.  2bco7NR8tZXpt
+#1,  3Lms6mMjgc4Qq 42ev9B2VFnKzP 37YhD4BAsH4ys 2MP1kBPdjMNtG 2fW4CdFThnSbu
+#2,  3oRuhvp45yZCu 3AnZwRRq9t5Js m325H7z5Rwqc  2iDUwv3bRGQWg 3V8eNj7BBnyCw
+#3,  DoEkbpPrBz4k  3rqrNRJsJq2d8 34SbaL9bsxUs3 2f1DJGTUMLozj 3GgnnW8tepv1c
+#4,  2aYrZnqVoSnCU 3CS2jS9kuCWdY 3F1BqWDARJsHu udvrdr8uXmNR  26JwgeoYRN8Zq
+#5,  2Ebgb87MBZ1eR 2ir17Cxb64tHH 2WWt8Yy7upPxA 42rQMcJLPBMwD 4Cz9ZjKpLZryP
+#6,  4sTYbcn4WdMd  hYRmPQoEkyAR  fh3MiKk6nWe1  3eApbZWm3J6Jq ZGWCbD416HfN
+#7,  2bch4KdhRf93X 3ZGNgx8csnAC8 NXy8Z9RUuvKj  2gDin3DQUV9wr 3N2JqhQf9byqe
+#8,  3RaAPsnV52yLe 3eBjuSCnNHQVn 3aQME3Y4MR9Vv 2WS717RFuXTFF 47LAUArT9uRCr
+#9.  xYSzrDs4LF6d
 
diff --git a/documentation/tests/exchange--encrypt--secret-only--hello.txt b/documentation/tests/exchange--encrypt--secret-only--hello.txt
index a314ebd..90d25fa 100644
--- a/documentation/tests/exchange--encrypt--secret-only--hello.txt
+++ b/documentation/tests/exchange--encrypt--secret-only--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm
 
 
-#1,  2Fy9Noa4rRVJJ PGDgxeEtcPd8  3E2mT55XbQUBr 3nQUAk5KrJTLz 25ZmVFWzDjryb
-#2,  34RKhfJybK7Pq LNKUGmv1NSb5  2zwigMMn7V7RS MAFUx8qHfDm8  3JiWxUBLeojU3
-#3,  23L46Fiz4xgAF To2Wm7mwWmZs  31pe8NBCVq1k  3a2UhCcQpzTLi 3zqgmNRqqdtsf
-#4,  45XrpAYontFPy 2rMGJNaUE7NZ4 4Az94cs1Qcqof 41DGLGAsr4BfZ KyNdFMcUZXWR
-#5,  fTbUGnaHi3nv  3NQbfhyoXeuMv wdq768wcFz9Y  2evsTMyNThPzW UtRZGipoX66v
-#6,  ttj14eG9GJ1C  4DnZxn5dQquFr NhnAY8rSvVKZ  3aXkA6DsPNWWE 3aSUzE2643Erk
-#7,  17JM1dwtHfqD  tHq4nR4MHjRw  8VeuQycFFHA1  27wGBxVfVP9zP W9ktVdXELUVz
-#8,  Ei31buZ7nWGs  YMYeq5kXECe7  2JzG4uDXKsRfk 2B5qNfSbSfjja h51YFYMsnkME
-#9.  44p1fmnZp69jV
+#1,  3Lms6maBPhFx3 WzzFXEfPMSpg  2Qr5X19wLr8AY 3ixBVNWZdTmYA 3icdDbAd3X1ZR
+#2,  2DZAJ1N4oT2xv 47UHqp8dmH45r abUgC6n6Eau6  3izSNyHEYHA6H 2vbyV9fkCcZff
+#3,  wNbiSL9zbvMx  2M1wBe4QCz4y3 3b7Mr69WTpjcN myWxgERMiJWn  2TDU2ptj9HX1A
+#4,  in2p6pVdzK8S  2hm7UdjS5LHEC 3w4pjtPYhKD1k BxP4C95d87HH  3vGXR9pU9hCaL
+#5,  2s7J2ZcKmQvKz CbrgrtJEo5gj  2p9kzmvsKBTUu 2TX5gJ1mgKQzo XPNHFyi7jEJE
+#6,  2QkkWNN4qDerv 3WH654k1i5Wgx 2pt3C26gjE3VY 2MkkSSXJL1ZJ5 hL7Pff4bUfdb
+#7,  3grZeyB9WYSM7 2MS9ixbcH36PT 2KKv7P9GAk6rW 3yZWKCTQBvpjR 2tsSjXjhVWgxy
+#8,  2ttBH8amd61xY 3raNfZHQryy5m 3frq7S1EKtg68 3sSPwvMtzFQEg 28NX2wkFsKMJQ
+#9.  JxQhiLW7oX3t
 
diff --git a/documentation/tests/exchange--encrypt--secret-only--notice.txt b/documentation/tests/exchange--encrypt--secret-only--notice.txt
index aaacfe3..8703662 100644
--- a/documentation/tests/exchange--encrypt--secret-only--notice.txt
+++ b/documentation/tests/exchange--encrypt--secret-only--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm
 
 
-#01,  2Fy9NoZB3kpa4 wocWR1vEFA7J  2co7p3erSvCBF 3g4v9MrKuqgA8 3kZ9TEsV6a2S
-#02,  3c6AjVhPPZvBw 3RwUcMqndX14W 2dAKjbmpV4uDZ 3CvouBUoAeatF 3WZionv66hMQj
-#03,  D1fkEedwAQgg  3vHRRQhCUShFe 3EMs4wPStXWQg 6FmSDh6YTdkz  DB4ocqPMdESC
-#04,  2B3YQRuLQDBfF 3UUyCxKaUg4yC XraJT8jnjQCU  3A4p3NLhkLvzz 3XvYc3CkwERw4
-#05,  24VUycY9gkrVD 3tuQ16csK6Qsh p1BF5CsLqGG8  3Lz7rXEQdiHuy YTZ2kJCWDg9K
-#06,  2xuFCQ8wWCFNw 3Ldyk4g9im8Gb 3eNtU3JAVeEQJ 2oqFubtSdEim5 2ddMf3GDH9HoQ
-#07,  2gNRcNPu3p3ZR oqp4ZzS5tbmi  3aZ1a8gtvLVpA 3TUDiZABoYDd3 37AMmdKmcSEfo
-#08,  294jccrGrYCKK 2B69K7xLxz4Pj 2Yh6GfCtixvpt 3nvJfE8gvZ3fR ZiRpT4hiuKed
-#09,  Sx4AeoWTxyoF  2vjyEdGf2JfV2 37vYboEbHxCfJ 3avLxtF4fDzZ7 2Kw6xJUMMVFYq
-#10,  2AAEKSknkDPU  4DPYoUKPFXxZd 3S1e8o7fv344n 2uX5z97bPAJz3 497jgpppm4tUG
-#11,  yBrn1DMpozw9  XDRCVmKXkuwg  Tmdor4m3NtTN  2yV8a41YDkdDV 4ExNWXyjW3d58
-#12,  c91oApPyjBGu  3oPkP3xN6QnqM 3aQpv8jJViac9 2Ph4u3RwyznFH 21UNJqeiAEqw5
-#13,  3KjmcevjdwV6i 259oTCS4C6V4A 6wQAzJzXww2B  3mCttMnCGccyx 27Zm4qfsEUVnd
-#14,  nfQpvQ6s6R3n  2to113quK8Thg 258WC6KuqS8UT 3xGnjc1dwVfqd cX2V4AYGYm2z
-#15,  3jVnFAL4811UP 3iXW8vExt4rvP 2UDg522nMRAps 2gUu2nxLm9xds 3DTuDhbxiPueF
-#16,  2RZSCRxHRyR53 2c8bJErzLoPNv 2pyH3D3AZ4Se4 3MRuFwS9KgkJn nrWr9Q1kf2Lj
-#17,  hN8YLLLojfSk  4FHHZLFkzXUjS znoU4bKfrBVp  2LkwbKF1Hg1m1 3jVpUre9Xw3YH
-#18,  3S1CojobEXdwr 3oVLamwqes5Nn tHamuwn9k1uY  2AaM8hTs54vMK 2Gbor7eveFoAu
-#19,  4C1UsgBs2nGEY PZZuheHaDzxQ  3JR2VimAprGRa 3Qi1CniexSWeq 45hCS7Fi6xR4P
-#20,  3esjtS1o57SLC 2L1K8SA6JPqsA 3fsA84Re87hrj 45c5ZJSYSGNVV 2mZtXvsscg4zR
+#01,  3Lms6mQXLQWj9 49Y1CMkpif8qa 2J2R1XgnanRwZ 3k4qckgyK45Vc 23Vc7rzCYCJrY
+#02,  3jXsJBEzJXLpD dUafNdAYryG3  3RmyPvUiJQKvg 3a3aXLSSQnzDC 2gkrffhouqNC
+#03,  3x4Br5xouG6Mh 2aeVkRZoovAUk 2BPeEYymE76Ah 4dnYp4wcNYbi  3dxBaQajN7xMT
+#04,  28rskcBSVCLMb 3Ci9eLhsyDRAv 3up7E1iiBi9FT 3biFtFDJFVDTD UUszVDk3Hezj
+#05,  49A3iHqF8GHXY KXQUKSGZQ2tx  3Rc7v5zHEsxEs 4A8TEe6LqwKSF 2DXuxKKvfezEx
+#06,  4E6FYSAgqxQr2 ruR2BS5N42pS  bKW3EC5djP1H  4DY6NxPSaQz86 fT1e4mrXocvo
+#07,  z5wJ5ZrXyQKd  49j641vgaDWYs t5Xnzh4q1qok  6zqQf4dsHCpw  2s4tJQYRav82S
+#08,  467GmUFNUQX4V 2vKmJkSCUFLd2 2DExsp2N9A5Kr 43PJLk34cPHG6 64UVDRYoHUdM
+#09,  2CgBnWPPcpHyi 4L4iqtWEpv31  GzgCNURfW4vu  2heDULEeNFvL8 3rnk5AbekCgru
+#10,  3GmU5trYdZiak 3Sr1TJCW1V2rV 42puwWGjY77tf 72n7wAtWyJE1  t1584XCibA79
+#11,  3g2z8MYHLH24s 3UqW83CpcZ3ni poZrXzi7MRYP  2SjE9mQZWY87R sfbip7wmKBX5
+#12,  wRoEnB6Mt3JX  g3pyDizzxBXZ  18aG3KTDH5cN  DrUXdjHcPec4  25ievUe2V8NWc
+#13,  6Agh1FzNFptc  3a8JSh1KT3j6f 3QY5q4wLEQMiH 46gVr3UaESAo5 41GWW2XGXGJeZ
+#14,  LU63vhxzCDkG  3tGQwGx7TAy6Y 2XC4ji8CYbGDh 3jtfhQaZLeW2B 2ZyxMyunaXVf3
+#15,  37jrCT5tDG41r 2shf2vDnu1ZuM 3AvTFY1zY9sDm 3cmqBZNjqYvTC 3hANdrGYZjYPJ
+#16,  49N7rPtrjauKS 3osrCQC8t1H9M 2A5PRH485ydPT 3KcNpGkVHG5SD owbV1ZeJUfuo
+#17,  3fWWFfuna3yqJ 3rXCn9gEGraZz 2GyjMK12E7jYK 2iXRG73Yym7fd 24kTCLcgQNozP
+#18,  2TCtggfhGZYFc 3vPYmBLrqHJ2u 2VSW4L8rExQxe 3x3wtTxafPHd7 4FgmRohxeVjgS
+#19,  2VuMg9A7ELUBL 49VZfo95AXLKg 4CprgTHbYcbSp 3Kh96zvv8udsF bzjiUhKwKev2
+#20,  HeQYAiowQTa6  3FCQ9SPzgWk5T 38yRuTRfRd6hs 2XLiKF7g8R6C7 2DhshA6V1N228
 
-#21,  3hcYksM1wy23t 2BwemozRVz9Zs 3A3BYb2keQV6C 2nJF112pnvV7r 25MQMQ9jD4gJA
-#22,  2PaSugHJj7p9a gwQLxqRJzqeh  sFQu4Bukmxy1  3NstxKmjTKsEg 32cY64eyXEbcP
-#23,  4BGtC6AUmvrUD 31njnFu4Kw1Nf 2Yg6izRKMtn8D JgA2Jw83qsrm  4YpT5BTJNyjr
-#24,  4AHnUBAfvHRwZ D3zJ5qaN2Dex  3CbeyGaCam2Hu 38LeTposghc1o 2KyiMK1dHR3XW
-#25,  wvT23RQjQdHf  429tvQHtciwo6 2MnfPQQxJw7oc H2TionB7wb9y  3qQL4dPZor3oT
-#26,  4CefDGW23Fs1d 2fZMLDbRKe5NA 2zMt4Hy7CXmdi B3jkdFfV2PY3  2ec5nHUNMUgWT
-#27,  45dZk6ihQcYXJ 3db56whE43DTU 3ifHwiBdSiFwL 2rXfwdGTPE73z U7S4Lb4LSUaS
-#28,  3Vn6ovqvYGFQE 55GXxorLHNts  2U3RNo8y6R5s4 44U4UYUHgwiqh 3TYjYrBYMtrxi
-#29,  3z8BBHGhoBA2a cWuwQStsfadj  ZH4ZvmxeauhU  3otL5cX2tHua5 3CoUgUD7h312G
-#30,  3nhGPdvXTZgjH 3PGcSywsL5kH5 44VwxGqwU2vns 3BiVbMpVFgedb 3ATqyEcvs2vcM
-#31,  3WiVWfspBaam5 3cGaiWgQdJFVp 474bY1g2AADE3 2nJ3wdyAwTjdg 29LEWvYNsbA5k
-#32,  3qGJH148VVvjT 371yvmhLpyncN 3KYXf2rsJEPpY 3zByF1pLoTYBE 36eTyuP4mTWty
-#33,  5aeEGGEDnsrj  z6esKx1hin1A  ES6sRSpcs7PT  3n2QNYhhTTmvZ Lo1fZtS7haaA
-#34.  3uL6VP1gNqeGf 7ionbbPWoM23  3jjHQ5ouvncBi 2hyc8C3grNmGz
+#21,  hNuhLnkeByyq  49zgLg4Djz1cr 3LV8aCJBkD8Sm crWKPogTFqLM  Qs4km3P88QxP
+#22,  3hf87m7qiDxDF khNtQFPAFRs2  2r7bfruT9aiva 2eYhsFfVTHXgh 2degNtPhspf6d
+#23,  Gc45TN4yUHhz  2ta7bZH83tmvE utgZz74NHbsr  EvEf87cPZMHM  2uKXAW7RgUtWg
+#24,  3ApL9X5FnKdXs x1WqdMtdpYdM  3HGMvDrjPGi4s 3PrgPScfyjqS4 2qVDRM7RtGFLp
+#25,  ppvLL6eUGEF8  7Rf58da5hbeU  PksBFHzLsanH  39R4NxzakHoj9 oFfGfnEM2w4U
+#26,  33xxsaPkrcEdJ 317zwfADqazEA 24yryKWUYSFGQ 4Aed9sVFCWMQx 46YTtj11qXZzA
+#27,  2FzSqzMWFPhJF 41zw65iWtshXE iphUXLXLyBvQ  VBGs3rqCTj8A  2DHTB1xE26mGf
+#28,  3evz9dcLJAgVH 3EGXwkgYZetc4 3CFQCkcdMs7T3 3CUGcgFjxh9Zg 2g9G4niTGAaU9
+#29,  3xgavpaMdtZF8 DTPfWhMxc1oK  LKotMxcszC2T  2jgqN12CvGDFf 3DLUcsfheDYUD
+#30,  2SfB8WV6C8jN5 3n6vU3xXfmhAQ 3ZPQ8ekg5GEuR TidkTHdXKTW7  dpc2PgXzMfyq
+#31,  aoXzv4Y5f4bu  3kHZ6MWEjdTUx 311TJgDUotdyy 29QdiSKZqx7wC ze1HJtsY2ksk
+#32,  3oizdexrBuafK 29KpPJ8dHNxUm 3Q1oYZFkHfd9r DiVn1VAj7nTc  2fJc5BSqcQGCS
+#33,  2pZW8yM9BA92k 2TM1Hh1x4mwKU k1KA6LLZJvE3  2W7rAdTpafHA3 2r5dPrJ4xN7Pn
+#34.  3gV2oj2hhBrNY Z8jPGEWqEddB  4CeWVaJEg4Mrj 3QsyKZzjw7jWd
 
diff --git a/documentation/tests/exchange--encrypt--seed-only--empty.txt b/documentation/tests/exchange--encrypt--seed-only--empty.txt
index 17857d4..3fa6534 100644
--- a/documentation/tests/exchange--encrypt--seed-only--empty.txt
+++ b/documentation/tests/exchange--encrypt--seed-only--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
 
 
-#1,  2Fy9NoW4g6yPN 2p8WshiGpt797 3M3GwynfBLAXq 3RpxKEHDES59b JQtUBXvYa3gn
-#2,  4BSP4BJ8RsiND 2xERXYGx1f9Wc qDU7WFTSvRaX  3qX2zXeZTWUDg 3RGmmzrnxhpjz
-#3,  2vNNaVq69FnPq 3SfGETLbNX4vv 49FiXy39Y9zSS 2SprGGdGZzwzG 2wYnm7f12Magf
-#4,  2rRLcAq2iJHw1 UzdvvVFxzACQ  2pe3WtVkXtyih 3Pd352ALnvmXF BKRdoo9TfnwB
-#5,  2Bof85pgHHpPS 2k7oLRLaqFTtV 2ZB4PnmyYYXvm 4Dd2SuKfQ8wa5 3XJcLsWDtgrJg
-#6,  8DaJ3r8eApTP  BamLavaJio58  2sLRkSupKWjh1 39NoLGMMJ1vv8 3q7h6JjC9PpMq
-#7,  3VbjSi3Eu1vRf acqd7BP1uDmo  8np3U3n3vLUZ  owFEuyffcPQq  QsXjjgFmTK9U
-#8,  pTwWjEoGZdJd  3NgwVeLs4wa4s pGEkY8YJU4r3  43RpT4kBrZdM  988BhLz6u2Fm
-#9.  2GpXoVmFQqHiL
+#1,  3Lms6mSznEKYh 3KZipbH1G2XCB 3dWMC7oneQDW3 snq8BJNmHQ2C  3UQMEz75YgQzD
+#2,  bRz27a85aUeY  2BHrYwGHfBER6 3YymCWQc1ZiDK U42spGaQ78Kk  2vBjPZRqZ4ghg
+#3,  djfkL7Zg2Rrg  2mXKiNQBFSERg 2PsPzChdNFpzh 3hg9uFCB7NJ1  2UANbt2ExH7Sb
+#4,  YBg3hBiymCMr  ELXD3EyHCRTY  kzYCwWhNTM4q  2jo5HTiacrXP9 QS7MsWwV8kaj
+#5,  DetFX45hDaup  RyjcoV1JEUef  2Xcj1h26g4f5L f4QW5QdFP22R  3nDBHoQwfRMgz
+#6,  GbAm6bWfYzA8  3zhFbUQ7pgmZM 3ZBU5rR1cSmNJ btTrVfFdMkKB  48FfWeZoTGbMg
+#7,  3H4yMbYCBeAUa 3nrVWeixpUHyh YeMQYQcvAnLU  3HFspKmWeAjLq J7w1CcdLT2KM
+#8,  aTM78EmGujHJ  34FLj9huBxJG3 363GCenYQKYgQ 3cppRVNoVCA1X YEbWsmBBA8Zi
+#9.  sPrQj8W5XMJ4
 
diff --git a/documentation/tests/exchange--encrypt--seed-only--hello--with-associated.txt b/documentation/tests/exchange--encrypt--seed-only--hello--with-associated.txt
index 653a442..4f82977 100644
--- a/documentation/tests/exchange--encrypt--seed-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--seed-only--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx --associated testing
 
 
-#1,  2Fy9NoeZ2Cw3d 3zjU24Wgjms6A 1YxVcTd2nt8s  2o9dKERzWL1zs AFyyNY6t3ojC
-#2,  3DiJnVSk8ff4r 3rYkZjhz3eoQG 294xAbhKe1gi3 3hdJyPdJzDqj7 2MmfL5eVd7wgo
-#3,  3aBANFKqb9rFh 45qNDyyQBRQHk 3Z82cv6LPZv3H 2kpJGbM8ETBYi 33kmZjic3Azcd
-#4,  2zcpJDVJPwJ11 47ydwnExxM9QY 2zv6JYDUeziNY 3XRNBJk3A7o9Q 3o27qSY1wgkMG
-#5,  2GiHbARC8pAcD 4Ds1Hq9rH3Ro3 dXZve9HbnqBw  2FkD1Kima99hW 2eZDmnb8j11cj
-#6,  47X5hiPDqcBZV 3aqgiTCmsCaX5 2nCZ5DLH1fnez 3TVZVKeRHfhtE 2mbYRgZ5cDgN6
-#7,  Gms6FQnvtZoD  2TDcXuSi35FzC 2dTubs5Y8NFaB rxAJfcpiZKsg  qJNvL3sBWkL2
-#8,  2EdXf9qVptst2 21djaw7iKf5pF 2P4WYNAGuQDoH 4BhucooTb36FL 2sVErE8xmnsvo
-#9.  3pi2BSRBdxFk9
+#1,  3Lms6mNCAk11L 3cMyythK6AcQc qYqtqPPjZbJM  44L9vnqJj7NdM 38Kn9oYUhLudp
+#2,  38jVKfHpbMv7X 3EX84KsepzzS6 4DDLT6SZYZLRR 2BAVBkD1qsZ8P 2fFvheV7rfp8n
+#3,  49zktMBwXFhM2 2KTAcxRcEBvUW 3bMFroc21Zm6Q 2JzeVGK98AJvP 3hK4Tv9LWyxF8
+#4,  zGxwBj4qKJ8r  2CSEv4fQ4qMj1 2un1831rZZov  3NYytvnCkUqK2 3FwpXL12wto8a
+#5,  3PQPkYNtYurKp 2NgNCQ3DxUnJZ 3HjrSFP7ywfDc 3djMML2gwkyXQ 2CQMrZ5VfghUu
+#6,  RfjDxSvmj3t8  2FT2LFyAK2UC  2zxHZFgf5cVxb 44bECDnoh49Mx 3XGPXkRzAjNUB
+#7,  3DkpUR2gnoFLC 2Pbtnm4PRG8mX 2aPBMK9aY4i1c U25nAhNCdonM  2hHzrSzcNu5yZ
+#8,  FfQEcWRBDTm7  Y7vcorB9dNcf  39GQy66tu2EPq N7tDVJEesxFb  4DssdMBoZdEre
+#9.  2BrE2tu1hzXgn
 
diff --git a/documentation/tests/exchange--encrypt--seed-only--hello.txt b/documentation/tests/exchange--encrypt--seed-only--hello.txt
index 384068d..8975aef 100644
--- a/documentation/tests/exchange--encrypt--seed-only--hello.txt
+++ b/documentation/tests/exchange--encrypt--seed-only--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
 
 
-#1,  2Fy9NoCY5n62S 2QzhZcTr4U272 29ALbAs46s6cH ABXbZ1fn27wx  kkX6JJ6XgRch
-#2,  3J5uUv3c9MaBZ jmXewxjCbCNx  2RmMwLGqzrueo ftE647PqxDtm  3Cz33brtbumkt
-#3,  DMp1ev7MaWgj  3hQfifqbeWS9r 2MnuyiPFs7tVw xuDH44bM4HVv  3C1GMi46arLuo
-#4,  3AhRYtoBeyZ9w 3EAcMiNoJUgeC 2qxBizEovGihZ 4FzijDdfBjRj  45oXJ2CKPScHM
-#5,  2h1sBsATx73q4 3b6gYWLVc2UUk 2Uv8W6sa6rLnD 2yzPSFkFRyygi 4rLP3kK6dNWd
-#6,  44jdMTX2DrBwH 3vxK2ri61bMWh 3urxe9hiTKSQ8 37pMzRC5aTAWY 3ae75YieypL6u
-#7,  3vv2v4vFTP9A3 2T5ppaH5oKbDc 3JRRhuUPpYxQM j7is64XN5iV2  YjhWNa96EjnP
-#8,  2Q3qcXnUN2XVu 7au2kEkcgGft  3mKM5234nZY2P 6TbSYwwrUbH4  3d7yCt5S6EFoy
-#9.  dxFqEdBDXjMN
+#1,  3Lms6mZ3BW6dt 27qScQdFab9qx 2xak1A27JUHxb 3EsiWf13D4SC4 4FTzaM49ofR4c
+#2,  2PjzMtqJWnkax 47W47V5BZpmwm 49LdyAAtMr5jz PCNHkvgH9shb  5FHSZaYo9AF8
+#3,  2TEYveaD62vVL 2EHSQ72bKfCR2 48q1N6c2nT9Un 2nXccPvkxKuf7 bsY4NJkSAj1v
+#4,  3efYGtRZPCUnZ 28HN2CsH2XcKH 2MURorNQQevFZ 7mmyE1EpgTSk  41F6JusXAGbNs
+#5,  325U8ZUmXU1qT 2zcDQhGVhXCwp 3dpFrLiAyMXUo 4Ewp6EHtyZZga 3H1kmHDAKX6Z5
+#6,  G4DWLcyFoxJt  BqCidGqD23f8  2qwFgNGZyyNUe 4PYCB56DYZWe  3VtdXNjQ7AjXE
+#7,  2Bmph6mdVmUR  3ZSqDi14srZ8e 34VoRkkgvSa2g F5gPbU2uk6of  3aFUAxiTxSvoY
+#8,  eFNz2xx3akyi  8aa2zoKc1QbL  49jTAQQSHH5Ez 2Y69Ns5QLnVei 3uiJnUkjsvcyR
+#9.  2sKZSy2bTf5s5
 
diff --git a/documentation/tests/exchange--encrypt--seed-only--notice.txt b/documentation/tests/exchange--encrypt--seed-only--notice.txt
index b3a3b4c..0a3cda9 100644
--- a/documentation/tests/exchange--encrypt--seed-only--notice.txt
+++ b/documentation/tests/exchange--encrypt--seed-only--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
 
 
-#01,  2Fy9NoS355CyE 2G44pXtH2hGqt 2jEC4V4nE1qcg opjsxQHYqax9  nbNXZj2smJAu
-#02,  3ZD9F4JUZK5jK gArhZQJVrq98  2Uzj2HwVuq8Rv 2SCLrSo5UokM  3wDdfLUbm6NFx
-#03,  22TPk2gAhrHyc 3xwxAE4JPz27E twCgLATM3ph3  3WBoxYQ9D6Yaf 3cCq7jSkur36n
-#04,  3L3xUQ2BybFMh 3Bmf6jvmCdCAs 4BuCzE3ZaLWsE 263xy43XpFzCa 48CxHNmzafYNS
-#05,  2SLWYGGGFrRRn 47pj4yr6BRjMB 2MUF7FLBVmZeJ 2JkcaMjnhQYwv 3AdY2torh4f8G
-#06,  P2EG7wBeHMeR  2EGdgVYjFqwZe 3DwVugLjyPvBV oVvf1caQucAj  2rrgHL6hYrP2a
-#07,  V475Gcofftqt  47NardpuRT61h 2zuCfL6RuRXd6 3VjnEzRUCJWDA xuPQrYXPHiwB
-#08,  LEoQuwN39KnJ  3K818Yt1gZBxs nC3BG7WtpaHw  24zUKx71HrWCu gLwSwR9uWVCs
-#09,  24cU6CTV4Djzk 2MPWLZTwVe6ZG Cnme98gBEgW5  2EeurC6TCgiLG 3qBe2GakGrKKw
-#10,  uaHtJXPg2eCN  397BKLkpxRWtP 3qi1bxBJzvWGD nWrd6AEPq38j  2CsrfgyChzTiM
-#11,  ToaSkvctttLW  41ytBstgDFmkw 2TAijR4MuvZgi 3ecALyj6TwCsz 2MqMHuc3rqFYQ
-#12,  43LZDLCzbzreH LEHq3XLds4SW  3biKvxcmBgG5G 64wJho2Ce7Ym  41yoVdNL2ixWR
-#13,  vSVdEimoMVdN  dR6N4aTXYAcw  2NMJTeyvUCuJY p7qA67tTR5YR  3p2WCMoubtFUz
-#14,  RuzyCFYZmcpv  2PDUzcV6bdeCr 3p4xrgcAh9ZZY EvbT8UDBr9HA  3wg74JWGRE9dX
-#15,  37opuMZKK7Ufe 26pq4VkgQaEuR 2KE35owbMvJQ5 3q8fDkXbUVf7E msxUk1QMyzJP
-#16,  2bLamZspe2bQv 2C6HsY1igEHah 2i1DjmHrxdaZ8 2XbV17YcSjJyz 3j84bwXRtfhuk
-#17,  2BESHVFFf2FyD h4tT3V9kJSjR  2SHkAYZoLFvfM 3K5PKjkT4dn1w 2DkJ9q7dXfbT8
-#18,  3WS7Fmrbt1gpn 3XUrmz982hewn 26sQ6aeawntWN 3sjCEoS869Die sLN2Zwn1uieN
-#19,  2JZJJRiiyprCW 6cd2MWUnEs2o  2DhrHbuSsKFXL 2sCica8GddWc6 22QAcAMDGMFub
-#20,  3YLNqEtbX8cYf MWM8cukR2Auy  3FFnxzs6wsKg6 7KMS2gxcAXsc  Fp24ryUkMV9J
+#01,  3Lms6mCNSvJTL 49umi22UaJSxF 2zhgZCFZYhCL7 y6GhSWc4jqub  2yaEcSAyU4tcD
+#02,  3eFEMPeh2NrcA 3xS3WtsL6Qt7R 2Ms8XBD3Riugk sKj7Xdd5AHtu  3d2Ypzr2NjsJW
+#03,  37HgfDX3zFnue FVfBivEGDSEh  2j1jrxctssdyn 2E6qoR1HYwRoF 3Ynw9KaMW2S8R
+#04,  2wTn7iMTktB7J 9xA8EBCxaGSx  2EgmrudB6zwGZ cDzDL8nFDFDx  3iaFfUyiWs6G1
+#05,  3fYvoWY2BjoNz 2bp8tWccnQtUJ 3GrkSBZf4QTbj 3R92rY15u15FU 3VBjNgnRuX9d3
+#06,  24xWWqUfgNBYM g9FLTDZBs6Sg  48ExbcNLgsp2  36ar89KMfmRZj 2YqghRPb8XcMa
+#07,  2qwZ4jrJAStnN 46DXBMTi8qt78 2JDNXVqVHSbGu 2sZAkkJcuNH4T yauWVyNZMeB9
+#08,  UtQW2hxgbHEv  974xDJaLNwxM  cUYdXfqSZDy9  2GwTpTnVRUZb6 3Cvr5iD4TNXpv
+#09,  3SFhiBmZ15roG 2isTL9VpZwBbF 3oZdhu2hRvTdi hhSuFQgc6mAK  m79CNheA8ApA
+#10,  DLHzzMeBHdBr  NXT9DDhoX5ye  2o7yXW6dAdyTk VeWepYsDefPF  43CqaSwuDiTqY
+#11,  3VHYBqqp7JE1H 2fwZKXiqMb2JX 2iZfm2zBw5cBU 2TooQeCpUFBaF 3qpZ96jJMzV9Y
+#12,  3vM2Nn6tfMawQ 39NiDzRQ13nEY 3f4wkR58fioEF 2fVoUhiQUNWYY 2LJipMped8zMD
+#13,  45LJQZYNVgRiC 2g6pb59978wn4 sYtifnAkbbhY  3YFeCKW2Rz7P5 2CMhHVNpR7uCQ
+#14,  3GH74MnDTAkuo 2nrAxNCAbcmUq gXB9TDSBzgUP  3wQLEiYhAkAFp 2fgFrxWgGWwbm
+#15,  2nYvXWmkPSuei 438fAz2hXV3cT 3AKvfA5XZF1sS k63sUbHjjKKF  XE7PZz3dobqV
+#16,  RPtA6pYxKGtY  5kdWmxvQeDTg  XRx8jtotvarE  Yc2rcmf3vfGW  XbHcmLrBFyFb
+#17,  2Fr7n4X4i7Zwh 2D2cae3uNWNFg fopESLSNCPNN  43gUJQbLjtADX 2WZkLcMFnKCXu
+#18,  46B3UKE68Vuxj 2UnKPzeELfvJ4 aJ88kZQyg85B  3SNjVzDzhTdGb YJNE7X3X1mc8
+#19,  2LgTiSkekjJuB 2hus2D2oBxKgk 23yd6RN4VYSGB 2BkK6mckXMRJq 2qz11FPUPLdWR
+#20,  2Zedyby4yXavS uZaiRki16eVq  3QttwNA7QELQq 3jjihZFRFeMPy 3mAz95hG4CYLT
 
-#21,  3Ed9rNwhsUgpr 3mWjusjLVeix7 26tYqsPfhZP1x 3dDA5ChAXLLTd 4AB4dhSudKyGz
-#22,  su3B2JykKxyB  usVd29Ex2N58  3p9pt6HauaHaD 3jQhvU3aQgQoV 3S8cnaTiREgr9
-#23,  3bUR3jqUEuyXE LsqxFSf67X11  3gLpm9q7uEptW 2hqVVSMosHdYG 9wuYqGrBbaqw
-#24,  45uiY16kwREif 3tJ1sDwFjzqLj 2WjyRBdTyaGti 2P3zywWU8jpNG 35c6LSxsKpMT5
-#25,  2uNDqU3uxZ5eA 2rmGg3GmAHkgB 2GyrB8FV5QxoK 3yBjsvHau34cv 2JPGaxc5a6fwV
-#26,  3hHJzHFv8Yh2  3DUC5eovTgHde CBqUPW4rYxXk  3NGdgW9NgFCuJ 2ZycchEzVBEeU
-#27,  2WxuuPkjTGoDc 3wq6pUWSB6xLr 4Us94YNapUCg  QDutAgkEHCDa  2UyPCUAVXLeRQ
-#28,  3ttLbyizDHLcr 3fa6vcvna9Nzr utceV5ddTVPU  2E1gv7crS8AJE 2XcQjx5SNxmDk
-#29,  SFCrSVzsZubV  fMwCPAkcPmSF  VEKVeheUw1Xc  4Fdc4aj98Y3ag 3pMJ2mcgCM2aB
-#30,  yC8oWuQoW18A  GTmwmNyCvxN4  2odsCvbmtu6wQ 9EoEFnLHLi2r  3E8p2J7xqQq9S
-#31,  3rrpiK8RyZqbv 3xQvCFP4v6C5E 24orzxYq2Ycpx nXUYLmiVxVht  GKq6rKP2AMHK
-#32,  3yzp8tLBSBWVk 4A2o2KAva7D7k 2fspfA99M26rD 2mvXVmR6nxxur WP34vrhm3Hnu
-#33,  BdXqSX1DNuB2  goc7Bf9VE8nB  44BMkqSJgJtVD NSUqkUHJzJXc  2dQCkGphYymKG
-#34.  458Ut8QAGPVX8 627n2V4uRztB  27wf6E2ezurYS 3AkLoqhM77C8e
+#21,  7kheoDjMKvnC  3aU6AbepjM4xQ 42gwg2LZGkaiY 37HXw7UgTzEzA 3tyiAZ78aohNt
+#22,  3gVkDjbqbqk6T 3g4yLGC79DPB2 eC5LHWi1iiZC  MyFpP1UCfthb  6fVLR2wAQqdK
+#23,  2J8GHspSzZXni 2ADUjhWk24KGj 7XEgytQ6XzrT  TrfC6tfmyTUU  4A624QAhtgbRv
+#24,  2LEQpzBpyAciJ 3n5hn3Lwts5Jo 3skN7bXYSDbWX 3NGwBEt1mwe1j 29S5BVM86oPYf
+#25,  41yF2FidGQbwS 4E6PCHZTewg2C 3id5MWK5B4XdF 3PkmaUyPsQKvv 2ry8V79bGX8oR
+#26,  fx4U1MDgavjp  2FxXQdTwgqLns 3scK9cGGC5Big 3EPhr4GuK3mtq mba3hZzWJPuy
+#27,  45cYHXppivdQy 2o5rvn8bgK3Pn 3wt8xLry3maGh 41ZQCQDjYPkjv SqC4JwHRvodF
+#28,  3JFkrZPy3emD4 qxjq1K1Q7c93  2NwxgxgVqUhwJ vVoKdS3frFoW  4BicmBANeh9Er
+#29,  cfniB33X87To  22cri4q9uymHj 4B7ESBGZ2bKgN EwBDqAcuV78u  2vnetk5pKNtU1
+#30,  rqCsYC4G6ZJs  2NVGfShFf96WR 45EvfR6cKSfTq 42fjtxRxGuSMf 3VsQ2rD6D9zEa
+#31,  3m4FAavCitUEw F5r4dJbM6hJH  38PBgAu3s2Guy 495id72pV5MLi 33ReSc2eg146t
+#32,  2eqatT6saYYjZ pjsyL63dGaYH  3KDS3VnWBP8nc WhdeR9wUvvCq  msrPRKtLhVsQ
+#33,  zpsf5hHT5MrZ  3PmQKze9uGrRC 2MoBeTE5RJba9 4AyYSnCokqzGr 26a3fPz1oSsfB
+#34.  xkFLDFkjLjYW  23WNFkveLy7Vk 46rbxj82b6sEZ 3RcRQFiabxnjK
 
diff --git a/documentation/tests/exchange--encrypt--ssh-wrap-only--empty.txt b/documentation/tests/exchange--encrypt--ssh-wrap-only--empty.txt
index 7de66b9..ae9a1e2 100644
--- a/documentation/tests/exchange--encrypt--ssh-wrap-only--empty.txt
+++ b/documentation/tests/exchange--encrypt--ssh-wrap-only--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
 
-#1,  2Fy9Noeh8tnHB 39WzZqz7BovWV PGrghESfyifh  QHV78McBYjXR  N9rgpkoJL1do
-#2,  2kNZovsJDSbCg vLp8oay1nVkd  3RaBFLpF59fpd 22gGubeGVwncr 479Nvuh1rfmnB
-#3,  3AgJd2da7NAdG 4BWDoy5JxxRcv 3Z8u4SwmPsVWh 3A7BJGYXqqtdx Ykv895LPKrqX
-#4,  3jmRqU45hJBim TjDNTQ6f9iKw  SwKWawWXMBYF  2A8uxgaoBhVhe 26cKs5BET75W3
-#5,  32QSW3thudtL4 2ZGJpECpDYjzL VTXVsb4aLKCE  xYnQXn8KnahQ  DPkocS1JKSFx
-#6,  3jkZFnFqL2u6D 4A9SRQMa2PQ8i 6cFeDLnJcToX  mxgR7vbtx7VJ  2yiWAteXFAEUb
-#7,  2nFELN4UAhaCd SAZWXDyve9pX  2MM58JBMSpdhh 3aoP5RAoQKKJh jPop4qnGPG2S
-#8,  48kg6zG3mR5k1 2ENxnpVPvb8Xa 3pVpqZhWKyJZy 33xTeC6WYidvq 3aCWhtz8XzcQo
-#9.  2r17Sx7DnVrzC
+#1,  3Lms6m6YrWqSp 2RoWEQqnHGXUJ nNSfgn1CTh8t  fquXVr8nqfsj  GEX7QrGXBfXu
+#2,  3KH8QnNJBATb1 bKsh7Yx9uGnM  2txBqyFMGBWG9 3wSfWPSemxbJQ 49FHdEU6ZPh4c
+#3,  3LR6wharftkct VUj8eKzRjf6q  b2q7R2dnXFs5  2hvbAFwFDddYe Bp9oJHTASQYr
+#4,  3y4CrGd3zirtE 3FEQUoSBigSQN Y7En7YB5qHev  3iiCLw6Carzxb 3quZ2Z2ffudSi
+#5,  JxwknTtHYJd5  3qV37zvCQFRrm 3bjsgBUw9b4dt dya6JTwCMqxJ  3ePUD5pYfKDFr
+#6,  3zRf3LRqx5YeD 23ULmBu137eAU 3aoMC3UZ7sBEG o44zkyB6ka3X  41k3JMEdnNxWK
+#7,  sJYwnYyMPaiX  2mkNxx9TTggt3 wthDZkNQa15R  2SERwa98caDkP 2YjVtGawhckjK
+#8,  2MnAPdoTg6hSj 36GvQaHxFAjex 2XcpMDPge9hBN mX6DEVgmwKfR  4DxL29Kn7LwqM
+#9.  LFLRP5WcSnMu
 
diff --git a/documentation/tests/exchange--encrypt--ssh-wrap-only--hello--with-associated.txt b/documentation/tests/exchange--encrypt--ssh-wrap-only--hello--with-associated.txt
index 77bed52..9d57d83 100644
--- a/documentation/tests/exchange--encrypt--ssh-wrap-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--ssh-wrap-only--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 --associated testing
 
 
-#1,  2Fy9NoaLag1qU 3U4qzpmgNgtym tiwXTHVDwdeV  r651FVoYf3xw  3CAq8ttnxRzWa
-#2,  21pG78j551hp8 21eURfiqnBV2k o8KBDaSU2CsE  BXG8mrJtLz5A  2XyY6x3HaWKtW
-#3,  3YEvoAMgu2cxg 1HNTXejN5WB6  3DEhLXQAJmcfJ 3cXPTu5nHr9Ft 2QBvtoQ7gr94o
-#4,  hw485tRkMNRd  CcAd37d9UVGM  223VqQ7Bioitn 3pSvazCN52paP 2r237iiNQiQim
-#5,  3xFGk5mmgq8dy 39Go5CxfrGRZL 3Z1fxDMV4j2KD 3PSrgutRLuGMA 2ooGen81eMqff
-#6,  gL772gAtFA3i  3bgshwLBfS7nR 2tkV6rigqzcVv sX2UWtHABZyK  2SKEtC6pGyKo5
-#7,  26se1SeENJHWT 32zrcp9FMYmZ2 gHUghUYnNt5g  3V4UKx5F7FRUi 3hUUmGc1c4xL
-#8,  2ZsMWmzUshjSS 2Vk7Fn8BByGyo NhpskMMp1rpa  Pm9zyj38fkpc  8Yhd1S1eBDuS
-#9.  3xmiM5S5ZFeev
+#1,  3Lms6mKTNjeqF 44PaMEt3TDkU6 21fvuEMJDW4eZ 3QRXyBeLtcxjz oBfCkcaWagsJ
+#2,  31EraPpsB66c1 2yR6itKdZEQx5 27hxPAvpVr3DW 3e29nKus9dn2a 2sgYXv7G7yuZh
+#3,  2VC7UR9x5s7dV 2MdGhpwxYdpMH 3tysGExCriKxS XVGMoffTRemM  3gPRRfhJPAqmi
+#4,  2xYGZxRAfpY2A Tq2Gj99ymQuP  3xmyhbaJX8R8H 2SwMqugVtvS7e 32jJBoMTydtKj
+#5,  2zqV8mugYpHcQ 2ePBacBCAjchG 3Kq5VE4nWVmcE 96F5NAg2jm3X  4CS1xq7BpF2RV
+#6,  29RU1LKSmoyqC bJmJCPfqgUjp  qhKjEgRZeJjo  3mWf4SCiEMYoJ 2aFku4hf1uxfX
+#7,  f8khvKsdCCj5  2s55mytBe4k7K 2Bf2PVQuxpvhZ 1aS7SmhMXbP3  2dTSc3mmVtkZJ
+#8,  2ZbBCauexLPQi XNjVFXRM21Kq  kj66DD713VPP  2L4xDsqgiMmL5 26sQ4BxpgSmT
+#9.  2yx7ieTaQDrTQ
 
diff --git a/documentation/tests/exchange--encrypt--ssh-wrap-only--hello.txt b/documentation/tests/exchange--encrypt--ssh-wrap-only--hello.txt
index f9aae0b..3e67dea 100644
--- a/documentation/tests/exchange--encrypt--ssh-wrap-only--hello.txt
+++ b/documentation/tests/exchange--encrypt--ssh-wrap-only--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
 
-#1,  2Fy9NoWKrh7gr 3ZTJ1WgET9d6Q VcgdW91iGx9J  qDQ7Ri1QbnGY  3s4vLuVn75Wtk
-#2,  2hZNwDH88pmsu 2999SPSovfdng 48CourRsYKfMt YeMviF8wRtXs  FFdppcMEgoK5
-#3,  2NquRmuR7nX8t 2yQtnVwCiEf8f 317jtSaDhYdXE 3YpPPZzSJkJwg R55JQtuwNSAp
-#4,  2aEkhH3VnoiWH 3V7ovBj5ACwsE 3udygRMNynHMy 2kFCmoeNNhGir zCfFythZezan
-#5,  3Zgyh8Wkfk1D1 2TTNwwP93MifX RBcx1ThrVrBn  i4mvYgyfjUJq  U5uxiZkA65Bb
-#6,  2aNhaUEquWrRe 2rNofdj2tBRFE 3C2wiaXGpaVo7 2e6hD7dZuLAbv Mm7k8PdhCJSg
-#7,  s9LBu1ZLREFN  2tQuYhykavhs9 Za3dL8PU9MAT  7Ag7GPDVyszG  LBxkbtcy7QJx
-#8,  5MwPVvwX8PC9  2tpUZU3qkw35K 3K7yrdg5SseRJ 34bswmwKpYRZN 2kH3EPKutQheQ
-#9.  3KdegEE22d9kY
+#1,  3Lms6mUwoaYYY 3NXuHfGCVv1R2 36CMp58evaGpe sgjBbMq15kt6  3QZHHpRTrYgjo
+#2,  2RShtUMnXLGqy 1MvVZBL5MNSb  2YrJfqL7GL5Md 95FuiZz1Cc2S  2hwDiK3WQ1kUA
+#3,  Y4GqEF9AtGAN  2HzFGH9ZBnNM  26fJzqUBfWR7j 4AAzdtii1V6XS 3b9bceW6zBY1x
+#4,  2cDoXhQVvqgtN kU6VozzRtVje  3PywqcErEFGpq 3wEgKfmEP34qr 8Z3sLtmP7nco
+#5,  327zstrAgouAU 2CMtZ7hPwbP4V zNmVZVApEbZb  3K9QsmvSFyLo5 2uswkMRkeQyrK
+#6,  2Nt6iQnTaQ1Bv 1ehbXnzDy9EX  2oocL676sC8tY 3ACyCc9yKDm2x 26aUpqgwU86CN
+#7,  2o4WD3kLqymJC 3Ps2DmRQeZuFK 2vK1CRzuSedzW 3D5aaEEuSi2gt 25PvQiCWfUe5D
+#8,  2YWN5S4fvo9bQ 4dpQ4VQRwax7  YcpkbFYPcEGB  9NaHr6uLgruM  3yt4jUu7TDSAK
+#9.  3dCV6wrMU49oz
 
diff --git a/documentation/tests/exchange--encrypt--ssh-wrap-only--notice.txt b/documentation/tests/exchange--encrypt--ssh-wrap-only--notice.txt
index 274ef65..e9f4326 100644
--- a/documentation/tests/exchange--encrypt--ssh-wrap-only--notice.txt
+++ b/documentation/tests/exchange--encrypt--ssh-wrap-only--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
 
-#01,  2Fy9NoSStpxzC 3FJpLxQ21dX8M 22nLX5F9gmMTL cAfZPgE7cP8x  2ArNjyj7T1fTS
-#02,  2k5PgjTLU7Eom 2LrfDRrvgh1Bh pLwyLtWSWimN  2wmeXKZs8WPkp RVtMJKeSRujE
-#03,  2aaeiDS1QEucQ EG9pXo3uRMno  41Mu78Mhjm5CZ 2C6ydSnMDnFGH 3eGvuYmaaiVyY
-#04,  3kUuQ1qRZ1Bqv TVU5j7ELUcnR  36TpnS1uRGkXQ 2a3RPABf1RCUJ Uz2TAzkSt8CZ
-#05,  3y12ewsFmr1eM tuAvWqGYj3v6  3rDkzVSkzJF3i 2GaY654gJZRAX V6abYgBaqmPG
-#06,  2j1cGFvynZ195 L4FnwUtyd4Vw  28RyNe33H5nTd 612QxQFs7oi7  2rRCsc96HTEkz
-#07,  2mFj7sB3d2Y8T 4EmLCvgJ33bqw 3JfKNGDc88ruK 34au9hhHsp64y 26RNKHKw9tAWw
-#08,  22DZUnj4j2jbt 3g3sTZYTNJJm  3fWPPij5HEjtd 2Sn1dVaZdT8s  rgL78e8XLNeE
-#09,  3Jrjf5t1UXNy1 2M4cxRUcyTMHf 2AZBNPJUzHbPo 3nj4rofzRZFNK Xrjt1wbiy6Hp
-#10,  3USBpazyQtT11 EDE4MjYWF45U  46rKLdL96Ctir 2gRUSe5ySfun7 313ATWWD5Cd8g
-#11,  2QcMxzavnT6xx U27tXbzjWaGC  3pEJAfj6huCSb DzzvbpiPjTVJ  3XDzGC3eghqtw
-#12,  47UhYKTGSK5rJ 2JwBbra6pJinB 2xx95jExCWeDY 1Lk8WMSGiyCY  Ah7NSDmdJetW
-#13,  2qEfAEfrR7mf7 pchZM4iV9NQA  eACiJDeJ8971  2aEPG8sEChmme 3YQM3XEwXEW8d
-#14,  3S7KtHRjgy3GR k4jDVeY4zhpH  kDXxHVCyCmZ6  fWvKCxNpKLcg  2WxiBR81kGgS2
-#15,  e2zXJiRHs2Wc  3w2zCsSsuZX27 29AEYnNmnsc6G 3ud85mGufmgTH 2QhdtTGb9Heg
-#16,  2o8wc2nWyd9Nd 3xJHhGXJCTrYY 2zux3AMVoZ62s 2svLcJNtHMCpD 2MAczUG4YJEgD
-#17,  2WgjbKYohndcc umut3yHJ6FkQ  3EBbPkexkJ3ub 3eh8F1Z6Bgo1r NBhZjxWB8Nbw
-#18,  jZrvpvgEmZnG  2xTTVeuLQRNNS 3AAHUCo3pS5kH 2L7HxMb6AgiPz 3cqJPbcgeZ2bZ
-#19,  2E6nxswD9mDwS 2rKqqBWCKHMUx xYCR2nW1ggka  2KpWLveSR3TBU WSd7oqvqEMux
-#20,  YyoLo4iKoUEj  7qgXWode4fBU  2tUY6165P6s4v 2mrQXcdngpo1g WTbhL57n9eo8
+#01,  3Lms6mF7NvKyJ 37fHpZreqWia7 XJpW6vkfTvVB  37QnZ66Bak8Fs 2mD3V6Y7hKqpu
+#02,  d1KRUoR1wJpi  2GSLCsTnQ3jNk ARjRaKtxdpsM  4CLubxUzx5c3u gp3BA12BFR5a
+#03,  43A8DVpvFLqQ1 rwsJ3Ju82gKo  46PAFRCQm8GtU 25xT29c5VgeFP 3E3fb7tKateRJ
+#04,  GRRcmt9iz5BQ  3CcCuBCdWcRF9 3CxYRYQQrvVL3 31QdrQVN8RHcS 3r2v4MXNwyFgw
+#05,  2BRyL5woVtaou 2gAVkPAtisQeB FgawdaZ5TB7P  2NAcU6pMgMsns 3tmBfQrVkAZCJ
+#06,  3pFGg89gHs9om 2EXuisTGxqBSi q2x4qCB2dgxX  35UJ4YsVcSYyH 3oFyhbHD6dPvr
+#07,  2q51NAZ1Xvb2X 2ByFYzPPnC4gL 2TJ8o1y9Q4WHM 3sSWqZr7AtxV8 2EXFHL4jQ2gyi
+#08,  2uy7EDC1z3j6H XRjPPjNcNEqe  4E3x3GdhzM3Te 2aeHsbncbdSrR 3Ueh2QqWW6GtK
+#09,  2AEuEKkBatvea 2XReyVUqnwTxD 491iKdZeQZE3p 34SVtXsLh4mEy 32XBp5AdaqyJn
+#10,  2DS3MxjL8eVtn 343qebiwPxcnS 3nk7V35Mqtjn8 YD27cAFvxHJ1  46ZUCCqoNhqd4
+#11,  3Gcmca2vR5wxv 2qYNXJ1wdPzkg 2xHNoxFwD7vu8 w2fJBddNyJKi  2HxTsrzT82j2K
+#12,  og2hxc9VDyME  3aV9W8eiwfMCz 32unCgmyYLNvT 29bz8mCmSEfjB RnC4dwE7e1NZ
+#13,  3S2iEW6PysJTM 2NDmXoZJHXnc1 nDnaCZrL191g  2GtEGn5jaNjME uSVJyHz9HMF2
+#14,  3aQW57UHJzAP1 2vZaAyuR69F3Q 2D1uTpqs2JCT7 2BzVJkNs9DmAa u9WkHyR11e9q
+#15,  rLTQrbJZZRCL  2FFVpZbbNCWz5 3yYJAJrfhFVoA 287sQSV5zC5u5 2bzvFMSf9yYXN
+#16,  CJcPW68VkFse  3QXykSKkK44ur 47TYqvDfnLJyk 2e4tmuyPpDc2E 3JKLBkBs3MiYj
+#17,  2AfNoQ1zFw9jQ 3MuWbU1FiKEY8 2ePADSt33yiCS 29myVzqou13d7 4547ou1B9RWsc
+#18,  QxvNEPHGvtyG  3HVqTK6RDiRMw 3UdxdTmSeKK2T 41LJtjBHo46rY 3BkVWyoTCTj4b
+#19,  2RsaKNmhw5RLQ 2WfTBAQPsQ3J8 26qxacEExjM1X 3sFYbLRr8WchQ 3V4JqLTUWgEm4
+#20,  2Sreew9k5Y7Nn 26iVLvyctEtKZ 3pbBahZ8D1s8a 43Y3tr1oU1phR 7viKbw34SRtV
 
-#21,  4941UpDyJbW4q 7YnxerbAsfA4  2LV5dN4rFhPcM pvnxz3wn3c9U  mJb73PZwnvTT
-#22,  2edB73mqQKE5a 3NEjX52DUtsKv 3uH1gm42DX6zb 3aiNQqMt8UJwp 2srBfWhP4YaRT
-#23,  4B6QiBmUGWXDP 22b5MrQ7zGCAR 2s5ujNrtYC3hL Ht1adnXKMfUS  3a2RdWmkXswzK
-#24,  k397ARxHY3NH  nhVAFcb3efrq  14o2131qsbbM  ijkp3TarVqLe  2CLvAWE294BMW
-#25,  43mz4ChkPtMaX 2h2rr4vppdmYM 37xne5c3ZYTt1 6bptdCERDhtj  3ktLeBgZRZfsG
-#26,  24ZpaWu4FPGvL 2Z2XkfXgxY6dP 3GirMQqumLATM 3ikxB4cY6zuP5 4FEjWerD4zvVg
-#27,  3gXPoCFFQpCLh oTNUd2yWv49Q  k5zMpxWNiU4X  3KwHH55yrwm13 2Q3F3FVdkpXMG
-#28,  3gxJNQTCffhk4 3xRTr5B1Skg8H 3BKVsfhwHfA3z 3EJH8pf8YEPUw ofw698PpWXBu
-#29,  3PVTdeika88ZZ 2MuHjAtBgXuGg 2oVfysohdDkJE 3BiYvWXgRpakU 86YvXxgZ72nq
-#30,  218Fw6gBebr7J MoqWKGRHukXF  3CeJfSi9SRF4c 4Ay9jYaDT8Dcv 2R1Gh456FUHV1
-#31,  ZeLQGWdE73VU  Nfrcut4cYd66  V4GrLcDgsFdP  3XfSZvVdDTCRR 29Hn7kfMMddip
-#32,  3nRJT4EMMnwwT 37hGM9atDFwms 3nHae5yk617dv 5daYc6S1h9a9  3cNXcdyZiWwMD
-#33,  3RadQfA4f84U8 49dVdGeLhrWSM 2ZDNgmK1UHCcW zfoRpGewPGwo  3QjtLtujkMkvg
-#34.  3WFxFoUmvE48o Cq34DKzdLBGX  JvJXixWyXhj4  QHQU6WSQeVHe
+#21,  2oEXa5GoE71Dq 2D66nNzHT1aqf 3UB5kPMEW3hq  32mHPrfQKuy7W evEtmqeTsSeW
+#22,  31YziDDNhZif6 49hqQU8sJcbMc 2J2bPV52xoL5j 3ti5rWD34q9Y8 2R9t4qGJ96thC
+#23,  7zTCRDVezyDx  pjLYoN9NRGb4  oDDv18ZizYz3  3dnHyWxMjyz9D 3D9iSAsQfbgoz
+#24,  tewKjLtcngR1  2t69AB4A85qNi 2MYxed3jj2ciT sNtf9NYHw9xk  39cqnb9eWer2Y
+#25,  2dEr6qGxRD4un Ktk7EEQFBjvs  7wPG6v4EKQPP  24vD49Scsgumi J9os1KvPWtqK
+#26,  U4asnkG7eDk6  2akoHYnevgWjN 2YjisZ2hqmXBc fgTHo2nFXwzR  3TM4zyRS4wKPV
+#27,  BuVaHGhFG6A7  2hzWpsnH1ApT8 2JBtXfGKVoFjB WiszRc6p5HrD  3KAo8CABmthf5
+#28,  okqy9z6twGqR  3VpNfhR9PwD57 252FHii2Cnvda V5MzTGGvPxDs  9zTzg1zASTPV
+#29,  2ckphLqgrZsnU 237kTHunp1j2V 3xCfVKmt1TdbX 4ARtb8dWLqLD5 jwZMF2PUL416
+#30,  ToawaaydbkUX  2PzuJGgSNmnby nEd3bU7J89BP  tZd7WgVsTthc  2rctgBrH4HJHU
+#31,  2sESMeLfp31LR qJdNZFLAajQe  3JDmwo9QNFdc2 NgDRhkGE2URk  26t2sPpkQXTAU
+#32,  pzu592o61NtW  fXKD3SrWUPUE  2kNzPnP6KTu51 2JT5Esk52uEjK 2UqkKR1xeH1qq
+#33,  3bEnPicDALZ7c UFWGuFRxEMm6  2V1yCrDHzrbH2 2a4Rc3bUCvbrf 3nQYEhf2vJw3R
+#34.  44q3N8mrSD5AY 3JKqve7D3rkLA 2Sbo463Zdba9e 4DKKrB35xTbzy
 
diff --git a/documentation/tests/exchange--encrypt--x25519-self--empty.txt b/documentation/tests/exchange--encrypt--x25519-self--empty.txt
index 3af52b5..6e72cc7 100644
--- a/documentation/tests/exchange--encrypt--x25519-self--empty.txt
+++ b/documentation/tests/exchange--encrypt--x25519-self--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m
 
 
-#1,  2Fy9NoaHurBXy 2kiAsBX44x8LY 38R1AijzcrpWK 3j8sK5iJEnUri 3xAsfBDECMUv4
-#2,  3fqrcDSp4h2pq 1Xe35JJuXeMa  K7kCz6FstZR1  jtUJkGLkTHqj  4E9a49HWdw8nE
-#3,  3cjruJkxSLmP1 3DT3b5MqMZY8  AWoVcKkxtx7D  414GjozsuQ31T 36CMc1dQNfEKX
-#4,  3ybanSmkVTmyC 3Tzy5sfp6Kgu8 3i321dS6BmqX7 3wCNjyUGfnoxg 3GwXfd5gxsanE
-#5,  EeAqBvdaTXkB  3rY9DwmBfo9Hs 2pbKZqshtNxVL 47isqrJM3KQNz 3La5bgJmDhLbN
-#6,  293b5HXiLWrsH 2UU2rMt5shwWV WSzT5JrzinB5  4AWa35Te61Y8M 233dmDwZp2MVm
-#7,  MfQPHLmxrZKL  3Gsu8RZTMJg3V 3JSZa4qqyv2aF 3hCfeTs6fXrXA 2QdgRqPF5PgTk
-#8,  2wb8VfV2qh1hN 4Df9RJew9jAMk 3rixTxwekaFux bqCFwvpDLtSw  fwRJHGBDWMmK
-#9.  4B9ZZYLqbU2nq
+#1,  3Lms6mHubybRG XLWeWk8Nnc6Q  3N7NQpYuJ8eLK 2iUDjQRzusaWC 3b8PrBqVXSwCX
+#2,  3u1PghPXtkXa5 3spchZvCZY4G8 s5yPKiVLkiX6  2N4Dsv7ZM4MpU 2F3YvhWyzBD8m
+#3,  38xGfBGGVKDVz FXbNZ75JAW7H  UhpWN5EMPc7x  2N1mXoShurFuZ 39tj4kyjJ2DoM
+#4,  46UbEqt6nBTYC 3ykK72z3zWj7F 25yLCA1e6QDqA 2m1qT7ubPxapV jwui6sN4riF2
+#5,  3eaS5z7J18ykM 43t4YeFpEZYkn 3FmmzgMbXpbi5 3Yo2mR1YvXnwE 3StebPgAfk13h
+#6,  2qpsuFGLxuFhB 2DoNAasfTbiWZ 34FhyeWc63NPH 3rd5TepTdoweC 2yFjioPs7XikG
+#7,  R6jYkBUH3erc  2P3drJVjfajYM W5wMZvwX8gtE  DDgLbdduexCG  FjtwzBVBKKKJ
+#8,  JDCyEtTApjUe  3sxMGHemFDAvn 3hebUgqVT95oc 49UwbuUsSTN9q 2bEHxXE6JDwid
+#9.  w39Td3oZRFi5
 
diff --git a/documentation/tests/exchange--encrypt--x25519-self--hello--with-associated.txt b/documentation/tests/exchange--encrypt--x25519-self--hello--with-associated.txt
index cf4f688..416ab8c 100644
--- a/documentation/tests/exchange--encrypt--x25519-self--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--x25519-self--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m --associated testing
 
 
-#1,  2Fy9NoNptsXSa 422Thv6JZPubS 2XJC7rVQotw8T HwLZuxqFkViD  3kU5c6zG3HFxF
-#2,  3JSsAbJwrjqBG 2mSyawWmBfzxa 2AHeEzrGyGXew 2BDw4Lfm1QYrt 3MgxzM1ES1HJS
-#3,  42gEBwkYB8cuc 2ZHGAebwgtZmJ 2yPgjXRB5DZ5p 2KnaUWWwUHCwS 3j88d3Bk2km6Z
-#4,  3nJynaqJRq8Yf TDJzraJAxccz  311XQx2mbZdTX 2pA9K5NEN7rWN pkwfvqRmjP5k
-#5,  2PpnjaFNZZ9aq 3gfG6adGVskwy 3WmW1uaieoSer 2Z1RRDbrQVLpX 3cudCP6QpeBtM
-#6,  3cTTXWJGRVQhQ 3yhWP5idsivpY 2QhE4gcPg11UC Mtc8xU7v1A94  2aAf6XLPe5CYu
-#7,  3edhrHU7ShTrg cRgxoc51EZnm  3fd7Go4P33usD GHKdfecyuUxU  3bFtEXo63EFLs
-#8,  4FXiVMVh44bLB 8yjiJqFCqnZk  29kEM2AeVFast 46E7kRNQaPXZ6 nEjRh5gACjxP
-#9.  7SP3UhiTS3pR
+#1,  3Lms6mMCv324d 2hh2ywLcsVU2r 4DhkAMZDPayvW 794MszUUWxWH  2vPbgfdqfyW6Q
+#2,  3dB4VsDDFFv3T WnPNnE55a8p7  2fjGx9VejzsMC MzzH77FyH42u  21BASj4xkRH9a
+#3,  3wK3ipRdqD9ST zS8eKpRAg4x6  3JwUBp9mXkFzZ 26A6kFGvptZsZ 2qFPuE5fCH7LJ
+#4,  45Qk4Zb8QYRD7 25ejhccZbTGeQ G39MhMqcqeQ2  3CHGDq9487yHN Fan1T9DPEAPh
+#5,  4AoDx39gTXrSf 4rfE15MsNPnn  nMvKR6VYMAUT  2ioYqcr6hHw67 39Hs9rUKU4QAt
+#6,  3FJHHM1bGqwJM 49fWxancF3cBx PW5tPMwj33UU  3mxEDeqepQ43c 3cqMWPxVy1XL
+#7,  27HZ5y84Yfgc3 3r8iVWDVo6MKK 3Pm3nRQuqfbtZ 2L9LQgT6PXb8X 3tv8rj9JHgLyq
+#8,  8XPWzuDu8ipH  yj52iWoFoJkD  2mGZsh8LR2pQw d49UFMiAm35w  2QNAYsuhMiVdv
+#9.  2BtgMi8m1RGBZ
 
diff --git a/documentation/tests/exchange--encrypt--x25519-self--hello.txt b/documentation/tests/exchange--encrypt--x25519-self--hello.txt
index 9e691c3..51589ca 100644
--- a/documentation/tests/exchange--encrypt--x25519-self--hello.txt
+++ b/documentation/tests/exchange--encrypt--x25519-self--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m
 
 
-#1,  2Fy9NoLM4CNfL gxvLwYfS45kd  47kHKrh5uHZGp 24a4aFTdBnp5Q 3wxXsXrMZTrMp
-#2,  47Ts6TPK37ZDL 26UYkhK21JqW8 31YTbT86vsNTc XRWisbq17WxE  3hbabUpXx7Lbc
-#3,  EXJRYdRCXAkX  3aHKtLemr1Ud7 u947c8mAg5A1  337BiEAzCE6x5 2VUKDh7o2K1Ud
-#4,  3nZLYZjjtvuJP rNxPo4i9zJUb  36YiCZMgGghyM 3FGMvrwRnJky9 fx6Dr31qxXPM
-#5,  umfYJBLPHHDc  3pdfAXWBYZPYy 2Cmz5Xcf5ksCF BGcKTJnfheiN  2ANKM667X76pw
-#6,  VwQT1tRNa1pg  2ygtpiytQjcmi 44ygxRaAFnvFY SkaGzPg3vKpv  3EgQEP6ee8Tuv
-#7,  3LpYCRsHiLpra 3FVoDoJY7W47H 2kLPFpxdDn2cU 2phpiksyxQSP  37z7msxQsJb6S
-#8,  2Gae8d2Hb3dwA 2cL1tUPZ4m6Yg WK4miAFct5gL  7LkBN5UmLjAt  haGbC1fpvxC3
-#9.  2Rk6W3CEc8Arq
+#1,  3Lms6mRMkFm3B 21pho6zCZbBsg ka7zfoxxawtL  292NFaVEsJDuS 3wivEGiTnYcZH
+#2,  3rkD3nq5SjMJz 3TpEU35mmhp2Z 2UkSZzbyCtyVW 2cmEpX6vHNd9n 2fSnTWEjF2RUY
+#3,  tTACCcbq7fz3  2eXQ2sdrQmrTR 3yCCAUU5y1byG 3ixf1FskXda21 zbPAGTUN5WN7
+#4,  46nHVF5eKWSPJ DEun9zfnw2Cm  2KMxYGti3kGPn 3YggQhgK1AWcm 3hQnGE7A6Dg6M
+#5,  4f8KMsrhXoFe  3HWE8zcBdgw3z aJNi4kd7fjpU  mv6LCpk95Jxe  3v75UrocvmNwg
+#6,  21QFEcCjzHSRf 2xCZpuBYNa6yT 32n61xFj8S1Ej 2bisRPTNDCb7v 2avYHh6GwHEuC
+#7,  2gDhsXJYoNSZV 21BeCKxmtiQhT 47utDuzqZafDy 2TZ1VnbJ8YTs5 3VMwiP1swAeEu
+#8,  cDYDtcjvR9ut  2tEMoVeXraG3Q 2guh2Fn317Wrg 2F4b7zczo8dqA 3iYAHeHD2RHc
+#9.  3WncSYKiUPwqA
 
diff --git a/documentation/tests/exchange--encrypt--x25519-self--notice.txt b/documentation/tests/exchange--encrypt--x25519-self--notice.txt
index 60e5c9e..714818b 100644
--- a/documentation/tests/exchange--encrypt--x25519-self--notice.txt
+++ b/documentation/tests/exchange--encrypt--x25519-self--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m
 
 
-#01,  2Fy9NoLyG8aPv 3mAPuJkrVQMMd 2XsAThKTASMK2 3CyiCPu1cizuU 2TxSi4yAMkSXx
-#02,  46fR5qFhVihex ksXhgsxRE5eW  2TdFkEiYQJqQn mFGoXfuzeJYR  2WreMVDpCJHF6
-#03,  24mfGrjtgvKJo 3tHevsrfANCtW 2npNuqA1j7anA 4Fejc3NqQaHwE viRqXskQczh9
-#04,  3xZWH72jA4zLB 2frnre2U9kuGS 4AjP1wa7wYWeE 2amiQyFjxiw5r 3WNRerc3MQooH
-#05,  2p3kMdeYcLgsK Vat6ynKHWM1U  3QGkSwhY1jamM 3Q3gy9cwmgT2R 3jjwhG2HE74JB
-#06,  nfaL3hRACHjj  4F3Zhq7Ef8Ajg 3vuxo8M6np6dr 3bHVPqTUB3oXb 3RSaxJWuY4mXX
-#07,  31CJsd6giHLM1 3eE2Kobx1LAR8 49DT8am1Rwawp WjhdUXjzFML8  2HhCfnznHxisY
-#08,  2mdrXQxSSZVCt 423mTPz42UeNL pnFEnnnYQqmj  468NGgaRgxrQC 3cknrhWRhNYja
-#09,  3xERsdkiTTgMr 4CpfrWwyn2uQ  3WfWJPDVp9ryS 32EHX7e48Xo2R 3NWzv4NtXNYmM
-#10,  2VNJLYr8ZgxRU 269Zrau3TDQMS 3qT6iJZfeX5Dy 2o9yJzKFnUwjV 4Bc58kYQfimQN
-#11,  2ejiYK13x7Cdb tBpiPkBcLTsZ  3jvEM3XNTi5c6 3EdWqvVQV7Eq5 37HirJkdxaLpD
-#12,  k9paAdTZJejV  43YBqdyQ8nk3a fnBGzGoT9Atb  CG4AWp74cHzU  245vHfXpSoA5k
-#13,  2Q21UxDWyAwLN 266NK8wRCYAyq pUXawm5UfktS  3BqWQ9VgfaWjd 2YLU6xxFLBqut
-#14,  U2BSJoAxrWVX  4DdzNscZkps3w 2VhXBekwwhjeW 3L9bYN6hQEazf grmjEb8WaeKQ
-#15,  pXxdEuERgtJa  29KBFTF415c5J kJf5VYtGeW5c  4dQjDssW8TUj  2oVy4TDhwyYDt
-#16,  3NMWeqenXBoRA 4EZsade6cU76d 8Ui3Y5E87eu4  2BYffRd7pQXQ6 2jkKZfXaQ8Jwr
-#17,  3sTFnfTg2mw8n 28VgwAwv8pyA6 f4cPfHAdMfFs  2ifHNnh2qZDy2 2iuVYQZCJRMz7
-#18,  pAZGcsHa3GHB  33cZWgRT2o5fz Qj2FEFZjEHKv  2TEjNdgMy5266 2S2xW8KarejuD
-#19,  3mVq1nhHdq9Np 1T9khQqyjzbS  2gJ5FyH26r2NW 2CFLeFpdrwRtb 2aRKp8hXea2qb
-#20,  2KkaHqzCdkruD 3FQ6yUuMoDVbX 3DbA1uigeySro 2EqrinRNzLUAq 3sq5tze4GRhs2
+#01,  3Lms6mDTmr3bZ ucahyM1S7hq3  2GRmymuYn724x 3zkNRwQTmYyfS rrdB4yKQsKAu
+#02,  2Cs9L6w85jr3G 3gbwpEKAjTxuB 2EsQMNgtYLJfV 3xck4ZopZRyMo 3Ca6VVQ5rNRjw
+#03,  3MSYkCfxczsT6 GJzu9b84AY86  j6Vzng1nq6ZZ  2xUJvpPgUPesX 3ZeaxaAbtJV9o
+#04,  3NZdvuYZujTVo VMdoHiEBH6RT  F8Ps1zCkwXue  3VgVsu9fjv9u2 2XdaBnyALCjcP
+#05,  3DpGzFTNuZLcQ 3AnX7PAYiuDne HKirf1Eiuvvh  7q98SAHhXjx3  Wwhh8LiwuBuh
+#06,  3yiUpH8tKvvJ6 2hExVWGR74JS8 34Pvdmx4DEdPW 3ZEwdkfiB8pfc 3hEaKddc655yx
+#07,  vmvzqnWi2Gzh  2KBhY8ofrfE29 2amQACGQxTrcL JncjCDD15G8C  9bg2UwWuvSuJ
+#08,  YyUEAqejX1ag  xQwnLuaLnRkq  3hT6HmF3Gxsek 2YQPohVEJ7mes 3B2qH6rZiULpr
+#09,  hQehFCtB3b3Q  2ZQyEJLdd5He  2FaT6bdJdSSJF 7baMXdi2hm2y  QEz5bRPR7FFd
+#10,  xynZurkophx5  3ubVRE2r5wBGv 2J9fyzY8BhnNb SDDpWEXLFjU4  3xVpE9S8m5JCa
+#11,  39u9GY3moE9tS Tub9dbUoKrkd  efYtq75nRHXp  31YaaXT2oBaUY 4Fs2iF3Nfk4Zh
+#12,  3jkiGyoTXqYGC 2h2SBBLuJMTXi T4t2tcB6YyN7  2AtdjaQXfre9a 2zmhL5hbPYoZq
+#13,  2YR1Mj3PVwU1j eAWGkqt6sHze  2gZ3MsoZSCtCR 3RKM2kQN3aL58 JxeuEbkD6DKX
+#14,  bVhC55xhPK2n  3futTxaKxXzqa 3P47WjxokEsaU 38chKfH72ZzRc 9bpc4vbKB754
+#15,  45P98b36u4x8H 3YfFToDR86WMm 2NWPzMeTEZQcT 2ag7X6vvxRmRU 2NJfR6c3vrMre
+#16,  35A1eP2Yht2jQ 16jRgq3FdEaA  3ZzamWTV61rds YDtwy9qpbA2P  2sAHQJnASuKE5
+#17,  2MzT46CDfZRjs 3Ndyw9peXF3Tw 3a7sXtMEMBAQt 3uqQiggbuSydT 4N9GZPJbJJ3S
+#18,  3ZBkCukBRQYJf 3j52Us2BG9G9A 2Zk6vZ8AvHpAd 2uZL7eM723NA  2t6iLniyrVVMd
+#19,  33US1xkUXcEEv 22c68iwvb5zTL 24xaY32r7L1xx ttV1dNQVKpPt  7MaBMZFx6TYW
+#20,  E4cWT9ab7JA9  2UTBCQpykZd7y EENPZLHLqcSf  3Jd8UbKR8eANE 3JNQJR8dfV1Ek
 
-#21,  36oYmGaiGKdZn 4iAQwRaVq6Zv  2xx1XrVdDGTFe 3rwdQrTgbkjfy 2SikVd3kHLqFy
-#22,  x1sBHNyjJYnQ  41Kok577rWpyJ 2NJZBQAxLRWmU 3m8Mt4CqAjzHN 46RAmL5C2VBC8
-#23,  3oVUokPoA1VCr 29fx17pRhXKmj FeZtm9TgPEvh  2x9jcMn4pmnE3 3M887QHvUFKUY
-#24,  3bZkcS1nGJZA1 8yQXo6NoDz1F  39Qy7cjo5gZbp n1xQn46KwGjR  NMEZoMenxsNU
-#25,  ABEbTRwRnFQP  Com7NKMrDe6U  2B5buMpLYzeL4 2VxmKSkR1hzWh 2i8NgzRyaFh2D
-#26,  2wpeeG7AMPcPC 3PzY7pUyjBJCm F95QRasQBxj5  43ETVWedCECRQ 3KhZz8L8xpqq9
-#27,  m6p63VtkXbjN  3JTfWtVotS8zg 3ERrN8GruMGP4 2Z5mUzhq4MjRN SVjWHgdRYwX7
-#28,  2E34xi3JEZLK4 2qxNF6cuDhGzQ 2Gn6GNZLfgLoe ivRCpX3Y8RfK  We1XHNZWW3eM
-#29,  3povzhr29VaFK HuqaJ3c1RGVB  3ZBWSrxFnuKgr 2VGCfgxAePhoc GXt3Huy45Gz4
-#30,  2iBafSThamb4s Es7cswE2u7F1  2QTqitypRh2ZJ J6JXY6K8uJdq  2pUuEJ4Mxw4io
-#31,  viVzmNyivegN  3AX91fgLQD4sE 2jhe1x5U6cDJC 7dyT1mAcqPc3  24y4rtksGsNNn
-#32,  3gfg9ZswrFT7  Lickabz3DYJH  LdfX96EdFmwn  3YSBdMSyVGN8A 4CqLwR9GRk3Xo
-#33,  3uQii2MoRjs9a 2t77xmXnHFG6Z KsGGUGm9Ukxm  2zSnwzTn7W5kF 49zupzUdNUiBf
-#34.  3sLaGzGtkk3S7 3pYeVuYmvzqVf 3HWBvMGrF1MKa 3zvyztyZnXmq5
+#21,  2DK9M7zK91Vii 3sLXDYMA7cWUD vhcDdZC82m9R  44BVXJzWTQYkx 3DW9HLcVAt4iT
+#22,  2seeX4gUGisMU 34qKPYXFrHW12 3m3z6rmRYtmd3 AdWHJ8PL6nRD  3rbdMK9qUTrKn
+#23,  E1DpZn2CieKR  3D4Ys8wmnHXiL 3UFwKrkEBUyKC XyEEwrexQbfw  iaKQNcC8cMGJ
+#24,  2aSXbKi1wdtYT 2V1CoxpBKibD6 18EkPcmJubH1  3yHJJSopA26bv 2QKBXdqzes4Nx
+#25,  d7yQBsbb6Yh2  3Ti4BLcMAaJzb 3EahyFvjyyiKp yXcErrwCouTs  3CUJxuegXdzMA
+#26,  ivSfn8GYLTF5  376drj2MXgXyQ 414ZyceZmDbsj 3zjt5CMh7iXBs 3UT8ohCTwTTQU
+#27,  3p2b6UfvJKCRP mXcTAxDKGWmt  hUWjtabcjm7k  3QjaPPNe9hGn5 3tKDHBStLqome
+#28,  3UEmHRSX2ddDY 6hgdYWwL8Zpc  3yGNB5oT539tL 2DVnKtyYw9JdQ PPLgzX1iS7RZ
+#29,  2hvp234SbRUMG 3kBZjdXpyiZY2 3ASSYLbiAmQyW 3HUV8AYkC4Tan 2F31Y99FZyTVw
+#30,  CwAxQD9tuJ95  aatuB7Mxuymh  3TbWCSEnE7UAH 22ijtcZXpwnsp 3hdvwML1qor5Z
+#31,  3drA21di1iLGs 3FUMhvMD8itfc SatbtWh9jRBV  3knKpnF4gqRfL 3svDy6nkLJweB
+#32,  3jVhDrQh9Po1y 2bLU6i5DeLhcp 3tpjh2NeGDG42 3ku2RSi6Jug8L ozr2ifrgzGX5
+#33,  3eesXmfnKRZPA 32cco3TLb4Lr2 2PiywfAAK1qa2 3m6KVvV8ojDdL 3TxDEfHjzYGfW
+#34.  3mJwZKy8vcJiR Q5KhYRrbHEWJ  2eseniUWyPHid 27fvuG5d8xyTg
 
diff --git a/documentation/tests/exchange--encrypt--x25519-sender-recipient--empty.txt b/documentation/tests/exchange--encrypt--x25519-sender-recipient--empty.txt
index d15cfea..b71614f 100644
--- a/documentation/tests/exchange--encrypt--x25519-sender-recipient--empty.txt
+++ b/documentation/tests/exchange--encrypt--x25519-sender-recipient--empty.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah
 
 
-#1,  2Fy9NoJ7LMCuz wyu7ehh7zcez  3pSNt5oToNf5c zFHLpuxxUo25  2gYsL9UsbESq9
-#2,  3YcPwrnG82QMR 3saZ8bxy6bEt3 cADvzuBH41fv  74agwJ5iTUak  43GjvymNAkSmx
-#3,  4CmfQxwodBMbc fxpHprozCb2C  cxDwN21PeLam  34ed5soLzJJ3g 2xDeSyrWmXXmH
-#4,  3vtfzXN8VXFVM 412nBcjZ194VX 9CQUF9NFU799  2oETw2GbMAg83 3LhHrFuAEYdPJ
-#5,  3hPoUSbRt3Xwb XPpR2GC6n81N  2P5bueob1vBFM DyjpvFADrdd8  3F3yaQPMjvk79
-#6,  3dRVbCqYi1EGm 3yS1KZD2B1bxM 4352f1JbzbVX8 BE7MYekiALPS  2PWEyJu4i2WYf
-#7,  2XPJGCosk2XLK 3yYvKSECv8oy  2qgSouQGQgmpd bCCCTXFju34A  2eRkuX2F8tWKS
-#8,  3EU5wJ2656yNk 44mCztB9Bkbho 2rg34wqVPM6pE 35a2mbTGoCcee 281MvqPwftYZX
-#9.  44AvXNFM9JhAz
+#1,  3Lms6mQ7fZm78 3rWTaLFojLBb2 32REEtYhMm2mZ 2g62QrG3f5cEm 38J626dRG6TEW
+#2,  RtvT1wZ2gqnr  3CbfXjw5Aj3eJ tj4Jizit5EPs  3gAZxXmHZ8Gn1 fswuy2M5Bq7c
+#3,  3E1MzN1MCuGVP 3VwsCoVJG7BUv 3nsBD4R7WqayL 2nKU4TirxaCfD EfLRkt1R2LXc
+#4,  2xUvs1Y3s16c2 49A2RbVqbtWbR 2GazNWZsD3Ky8 qA7u5u73QcVz  38chhn5msjYMN
+#5,  2MSjVdAn7p6zY qbRJMCynkG3y  3dVynnxoyxYmr 3njDSoN2SETD8 27ReLfbkh99ER
+#6,  3tgMHF3mtX1Y3 2kMu141WzNkR8 3uuH1AtAWK8gd Y62t2X38RX7z  YZF7Qky59Lzv
+#7,  2qbCceJW9iaPL 287VqYHGZJJ6r 4EYv7mYRURgCv 4C6udY5HyHr7z ELcVHi5hFdwB
+#8,  4EBZWUotrZAde 295A7RtbawKAE 3DccxWNqg4uE6 3caS7Sg7majKe uhdFh8vHdhPU
+#9.  Y1F6r7cNsp3q
 
diff --git a/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello--with-associated.txt b/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello--with-associated.txt
index e5849d0..5883081 100644
--- a/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello--with-associated.txt
+++ b/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello--with-associated.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah --associated testing
 
 
-#1,  2Fy9NoLtwex2Q ETpioGL2NZDA  2vuSCSfN3M6Ln 31fxaxtw8yQpM BLUceaLmhJHU
-#2,  2uRuLNjYN4fAq 2LoQCs1BknC7G 2JqK9bUKV5Jhp 3mnbEVP3pAAtC 3668bVhCgp7kg
-#3,  2Lfph5WCNrkgE 3bzSsfAaxCWh1 3gMgdm2JV96uC 32nhT6wMvRrhT 2UApWhR1U2s8J
-#4,  3DAqyZVpkG8wo 2VEU2uZrMFuCk 3avDNuU4Hf25j 2KMtx9kqzjwXh A4g4aUj5ZHQ5
-#5,  2pu3bkoYVqgjF 2djz279TmfGSo 26hmSCiofbxtQ 2Ukf9YgmwWuwd 2zPZPbG8wYiBJ
-#6,  3MCEGVeexnFsg 2C7dYYCE1n7a3 scDWNVUENycv  fAGK275mdaEV  2c1j1yp2GgXHf
-#7,  3oUtebCi2hhhc 38tWzXDiPPgkc xxsxmx7AnuT6  2FC3iJV8yVfXm 3TfJsgFgTUq46
-#8,  35Ewd7Ce6ufpt XwwNbtgFHbb8  41NEdn5emQ5b5 2q8Bs3qW97NeS eoPPo5ztgiZn
-#9.  ur7x2UnYiZn3
+#1,  3Lms6m5waWEyc eNcnfsjA792E  21LVHtZWcauWr 38QJ1gxKRaDX  3vKQ9uFfFe6e9
+#2,  33vFqxbiZLZRf d8nf1iWYJTpN  BuSpep9jvoQK  2iB6wdJu1aX75 4y8RZibwiQgt
+#3,  3Usy8R4niqDPM 3Zw3v2zu31JEs 2u73tNJEgRF4k SgNNBXGDwWxk  Ffjkr1syUwzb
+#4,  3BHb9p3EzNFpT Q7eHHBEzHnTd  3PSisa3Aon2ky 4FjprHVFh7mvW 21bGDUEeZCNYs
+#5,  2PAPmK44M2HY2 2HxbGCmYtyCJo BqHPa5xB41Sm  3s7Z51j6nHXrn 2DDSPRmwTjF2G
+#6,  2muGaoqT5PA7s 28VrroCxazUaN 2LjJcdt2bWde5 yiNyuabJebfp  Kap5gKjwWybd
+#7,  25GDXSK5g2irw TEq38vBPpruh  VwPvED6hwVXq  2RRDc3EtwKhej YLMLyYuywXnT
+#8,  4BoVagUzUNtZF 3xBc5G8Kn7cqy 3uYMovVygNpYd psJKgUhWbqbR  2bSV2TYL6fowb
+#9.  3ewpKM58m5pPP
 
diff --git a/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello.txt b/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello.txt
index 91f5c25..75e7879 100644
--- a/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello.txt
+++ b/documentation/tests/exchange--encrypt--x25519-sender-recipient--hello.txt
@@ -1,13 +1,13 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah
 
 
-#1,  2Fy9NoBByH8mq 3cKfQWrRgfSFG 2afuZEYHwk6fj mofhsWinDwj2  4zTji8bCsJ6B
-#2,  3TokQwCJFqNwN xDQ44PvTkAYM  su5WipmdnGvX  448S82kk5mHyn 35TDc7vYxAfAi
-#3,  2EikdvNXh7T9u 2erikmWtn34Lh 2eTDQGVH8ZGjw 2Ta2LsWhcv4PL 4B7fF6ixokdL2
-#4,  2qHRTUA8sSccD 3s8sGX32rV7te 5G7VyEhkcNmj  2tV29B6s6u7jJ 3GZSVcYku3uan
-#5,  3vjgHXyJd2ckC 2N7uAo8UhJfug 2sL48P5U78uQR 3jWjGhE9kdZQh fMnGtpvUMZWN
-#6,  3GB8sNBoQWf94 2Lh4VfFxjSjb8 3Zm2NRoTLhZSq T6vxKFGcy7eF  XjEddz3fdqHi
-#7,  2PwiYfa1oVJ6h 3r62QhtKVHdmm 3owdXgxnNqJXP 39oHQ1H7mKryr 4E3shw6i5f9J7
-#8,  2m3QWCsxfYwVP 2esk76dBpy9J2 21sueqoFiGgF5 3EtodJf14ejB9 rCj3BZfcCrU
-#9.  2fFfSXBBndtek
+#1,  3Lms6mR41CXDZ Mf9wgn1aRCRh  3KTY869dFnSjm jZ9DmPGyRSh9  2VNs2sbo5nb7x
+#2,  3By5vs2hnxMTm YMkgr6LjvMYS  46Xw87xnyRKcn 2xKG3Ka2xbTZo 3ANKS9SCuYT6p
+#3,  2qwps3SCW5uau 2MPGxFP4o4bEh 4tTA79eqjPas  35GjqRTF8JF2  3GgoJXzCDnFxR
+#4,  2Mg9TwN7m62MX 277Xnkgpe4rT6 3PhjumLpXD3g1 3WLJ6PJMuvDU5 2JVeqFvdjK26s
+#5,  qhcm42eNZquc  2FUTqaan8p4SW 2cibcqaCdUypW wCg4a2bBYEGf  3iLGTqrk95hDn
+#6,  2GacKsNrkJ5aC e79CUZtysPoS  ZvntBdCFHEUA  2C17cUYiCYZMS 2tdoYfHy6Br7p
+#7,  2EfamYKq1EqS  3m61hH9rwuzcT 36TBUouBGDNtA 2QDRo1o4dHuBr xwEezhJvCymC
+#8,  4AUhaHXEA1sgD 9cDqTnphREsj  3wC3GCjrDbqe2 3odHifxJhzGDa 4FVvzsR6Wr7j1
+#9.  BQjtLM7aMENW
 
diff --git a/documentation/tests/exchange--encrypt--x25519-sender-recipient--notice.txt b/documentation/tests/exchange--encrypt--x25519-sender-recipient--notice.txt
index cffead6..6345ca3 100644
--- a/documentation/tests/exchange--encrypt--x25519-sender-recipient--notice.txt
+++ b/documentation/tests/exchange--encrypt--x25519-sender-recipient--notice.txt
@@ -1,39 +1,39 @@
 >>  z-tokens exchange encrypt --siv --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah
 
 
-#01,  2Fy9NodGjmrXN 27VqxjA2tLvd3 3PjYz6fvuPnKx H12SSs6HXeHs  2B7Hhuga1S4Bu
-#02,  3zGFAzhAmQaAp 3ycTSx1CXjpJN 4DDkiecHdkzoq 2Tv7Xj2gyDaEE 4DqMdzSGFTAak
-#03,  SsbpYYJY5tej  2VUNMFbH31XYg BpNTgDiWmRbf  2wtEMmrFVPsM7 2dyngfyBnwYif
-#04,  2j1AFUCDBR9p9 SbxB2dNeAD6m  2RywtVBpNtVWf 2pMc2jPCDDit2 AoSrGzEiq5q4
-#05,  3aTUpt28gfUiT 2qzdjrAWn12yB N4P4hUDhN91N  3BEuavSPPDbPZ 2V5h4GNm2SzFu
-#06,  TR2MuYQ1VTQM  3D45iX8h4uy8e FvtLvUqyCohc  2xVANCvsAY1TG wzvJSPWSLV24
-#07,  JauXaKe5cxYj  462rR6qaUYSZu 2paJpddvmGpes 3t1uQN1mrSEKt 3EwdHcbMUwqAa
-#08,  2nKuyZ5bAz43a BDkWZsuU6sUv  2RoEK5CHqbsFA 3PzNWQDzk6gHf 3Y5QzxYBGu4MR
-#09,  3AEA7rZ2j8nUN 2RN5rSiBwDkVi QKyCnHSHTxC5  3LLbUexZ5d2ha 4ASfQQGnzHUrU
-#10,  3tbLGUgHmaafY 2kWAoNqMmoz4q 3tYdgSX4mdxtV 21bPiAz3Gipzq At7DdGN9NmML
-#11,  CqXeLVWhvhTD  443YWEaviq8yD qqnGAuyE3FBY  2pAocFro96psc 4Fjq8VD4ugzM1
-#12,  3xsRTRUNe2QZg 2d6wnczL6WGtr X9Ek6Nt1s1D3  3TN9rMJj7DS3N hBPNuXHCiA6f
-#13,  28gJYxb82zwWM 3oV4rRsThbFFC 37yWVGefK1zSg 41oJHCpgQJkPd 3iQoMjjt7axvH
-#14,  2j8EtwjDzfF3K mWsPd5djRd7k  r54zH5vKVsGp  GYYXHH3GnSTx  3iWB57ykNpJ8c
-#15,  zCk5CdXvpoT6  7u7rXT4kQBaL  2FKWVmpND8dUU 2stDLLNkqrYRq 2A8VXXpnLJqQK
-#16,  3WiMVQc4orJhu 37v5KPz5QRZR6 C5xieSiowXFR  PuJuwhiePA4z  3T6QkxFywMFv1
-#17,  2Kgy13V21hxhb 3cnqLBDPt5EzT 2xhMdXYBBZfRs UpfRGuNb6UEk  2Ho5N2BgsT2K2
-#18,  2KR4qintSdT6c 3GcSmJQSYWuxW 3h9FfFxnExPFR 3HNEPgfZYWUmo 396BJDpU1JbKN
-#19,  bC3Yx2o7izKv  2hxHgpfZptp1h 2n5KDd2m2djqA tHNHTNoH699Q  2Qy2nMSCTCzDH
-#20,  CRaMH8KwGJm4  3fTSVcxkhunfk 23UsUb8DU8LjX akbqZUFDk8iF  3PN38XdCyGXzb
+#01,  3Lms6mWQgG4zF 3KS32k4zFsExR 3bo1dnCZkfWdR 3jBj9kz9dQd44 bpWCe9MLRTgp
+#02,  3VDZ3mWANWhuq 442LY1YCFtdFC i2jRp4L3PM3s  41VHnLFovP8jV 3Wxh2ko3c4B5n
+#03,  2RXEdzhEMU8Yg 33A13cncVUSHN 3aMPVPqRJmGuo 3NwSqcHjC89wt 2PnsGy2N2hw7d
+#04,  2vcZ6Qear1kHh 2PQYxqzNj9MXQ 2Mpck7wKZuu76 2gV5qW5in8iHk a2V2rrtNYwVu
+#05,  2osdsHWRYcGRY 2Ruu8ZW8vsK4r 2oBvox9ALETA9 rCijYMjYmsrC  2oYTXza8Rj6rT
+#06,  3WQxQMaVLmrsH 3wmrE197qJ9rN 3nwpv5YuYoXBS 3vC8PCifwrBBT 2kb3cMak689Q1
+#07,  48LKsgZmTZS2h 3GdKfF3p8jkA5 22Qbftk16hM9F 34N2shWgd8gPW 48Udw9S3rfhe6
+#08,  36AQBgsGe9c1E FYsK8upssT4C  eTu3XeU2exgo  42WoCcPpqsWSa dMaErynfHwTh
+#09,  3sTdYz2wcWvgy wUfAFQYxDPyR  2w7WH3uerLtkY 44RXwoLdHXttJ aERmB3ngJuwk
+#10,  SdXjmvEHd7ig  xzRJr8BqJz2V  44aQwBwwZgiqS 8vQaiWNRjFaF  22PGH3wiV9HJK
+#11,  3V3YDVXUHhbYd 2BiM3AhpyPL2M 9HB1qXfwisCT  cyq5ToF49t9B  2NeweMwnGijeK
+#12,  3NTJUg6hhGcwA 3wqpVa216N6E6 3gLYQmCpwvo4Z 3DSqSwPy4SKKK KMjmdiPpAHU3
+#13,  3gQntX1uguJRv j5GU6GJp9uAo  2rPsWv3D736ML 2ajbpH6qR23ge 3mbf5FtQcNVaG
+#14,  vtV3GJyVjDrB  3YwFTgxBESnN4 8nc1BDDnaNKC  VW4EtcoDkVTj  2A8jg7FrgW8hx
+#15,  39oj8EhnQ8cGT 2nTRJYC1kEu1P 3R9Bfna8wJ19A 2XaMo9PCLxsu9 mD1uvrBqgYP9
+#16,  31x8vB46AYt3S 2PSyJ63voKt4o 2Xfr9GfdEEPV7 2xgMKHyswKJnk RGssyrHVXrGL
+#17,  3oZs6ZJpB63E4 KuAJrPc37MjZ  3XyxD82qPiVo6 Xf1awfEq5RSQ  UrEWFhGS6vXn
+#18,  3wGf1knrpMfzW 4EiLUyLMETJSj 2Q2z6UYzkryeo mBzyCXDmUaBa  3oejSydKJ91qj
+#19,  48mDYKjgqCWcF 2coHdYw6fvQvg 3U5XM1Lo9EmBd 47C8X3d3TV6Ni 2Z23yar3iW9N6
+#20,  nKJ3KHGqRKyA  VJbKJA19Fnm4  SNmbJpNjP3dV  Uig2yALD3YZs  aTudvAcY6y8B
 
-#21,  BJmUzZ14cDhA  3ZZiWyXNWrBoh 4AN66xeWEjNmu kxNJ6KhxwPae  2sAnukaTRNefk
-#22,  3czih4APnJs1A AHFwr7Fex4T3  2CupKeNyjvqhh 3rz2oXLTehEGW 3djoE3L26CadS
-#23,  2ChV4f8zd3x13 3ACjSDaUynCe7 2oRoDARBEYiPZ 4CnfWYC5u6a1G 2oErgwX2xxTjG
-#24,  Vi9DAt1JG8Jk  2tGcKNAhi1M2W 2ySxs8R6NQKX3 3Q9DdS5M56T3d 3BEXVFu1BxJRw
-#25,  2ZPcXCMFqEWeC 4FWrdxhMcrPc7 4VgdigAFxev8  2zqtnHkp9w8oz rBYRYG41rTVo
-#26,  2YVjRCJ8bNg1h d4VKmg8bkEGs  2tU1zZ9jT81bS jZBxVMBDUFaB  3gY6JKsD2yzAo
-#27,  FL1oEUqX3DzC  bgHGhWb3cqaY  6Kj8PfyqdRM6  RWo8n6htY5DU  26yZkCehMmPVk
-#28,  cDB83TiJqZfq  2hUNRu3PKL9jv pzix71yQLzSu  2LrGNNWDeLMc3 2oahxVvjjFn4t
-#29,  2UxaGTqR9y1A3 BhpNBoML14B7  La9pwifHx339  2R18QfBCZAneP 3ALWwJXuUPefV
-#30,  FmPuSZ72Ycba  2X1FZ6KQ5jLMW 2W5xhV7Mh566z V52HN5pss5CG  2UkmWV7F848XV
-#31,  9qsiNUkgCroQ  491HmD3C1i1V2 39etkf6evq3qY 26yU4QJaauT5J YTebGxofHkQ9
-#32,  3VWWKFebgDrVk 2Yfbk4Kp74Wak 48GabpWe9xHfb 2sizTKP5CgUCC 2VQapThmYKsJR
-#33,  iRttWpR2emt9  ophf16cJKTMQ  24bdh66vpFrAA 3B229i7RpnYxh 3jYUsuLvvp57n
-#34.  3XHe64Hon8uZy 27JNhCAHCLBBW R1tMuewXiQXk  FkengZHu4xwB
+#21,  ktBEwCYqdoHa  3r1uTZn3iWnjp tq1EM3b9SfY6  35qT9g8jCE7NH 2A9iiSB4qAJjS
+#22,  2W5rUSNbXCD2t 2MuVoU5Akyo1c 4Etx1145oAbBL 2BfdGrxcCmmYi 3WrGFo64tcWZM
+#23,  32FxJFJgrUA9L Yo8rWSwC2tUA  3PbXQZFpoh4Jy 43WfBoW7DFYgc DHBd1bdWdQbk
+#24,  2wSjX5jGwxvGa 46Ujb9VNgXadC 3inNv9ei6rteM 37LSSdH1D7xJC W2jZi1PC6Nu2
+#25,  HcNyZN38eUmU  4MUTA6HsEnxc  2GcwJmn47KsoB c6PbQxL7FifB  3cpTTXGpANQzM
+#26,  xkogBuaBBtaj  2LsWrQZuaDTdq foND2mSznk1c  2otNmBjMKiZSy 3BK3wB7e2n3yR
+#27,  uVBYmfkDWmyk  2ruXLoEVUk38n 2K5EXb25ASGpf NqaQoat64XVs  xu74VFiWLBEC
+#28,  wacLE34vzBMj  2ogdieN7hNknJ 3pYHixMBkHf9P 4DNTx8ysm64in 3XA7jpt7RcewF
+#29,  2n4BpjWQ3s2LV ywn8f531ad1r  39aiziTitqv8z 3LQidtxMFppTa 2wCzidTJaju7a
+#30,  2GEPXSwFA8nrt 4GMVLbUV4pZk  3g5BGLU2Z4vFi 3k9NwzJUvtjAa 2xQKeCnwAyVEW
+#31,  3NeZVTfKcQs8S 3Cn88XiDeqf5S 47w4cCC4EUVk4 2wg8Vvi2h1B6M J9oGZur7RKv2
+#32,  6925uPi58VTb  2tRUCHD5t4m3Q 2xEniGJaNuSU9 3Sc8hUohH26Ek 2wEsASZNBSXkv
+#33,  BpZ8jmt6Z9dv  46hQcvJetAsXZ tDXpEWzyms5N  ozLvvSSumULK  2MiSq31bYD7GL
+#34.  2PH8PpPqxLUa  2FPvME3pakrjo 4ANVUKrMtKacJ 2rE2AEu4YPNHe
 
diff --git a/documentation/tests/exchange--password--associated-only--empty.txt b/documentation/tests/exchange--password--associated-only--empty.txt
index fe090fc..c77df86 100644
--- a/documentation/tests/exchange--password--associated-only--empty.txt
+++ b/documentation/tests/exchange--password--associated-only--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --associated context
 
-f7cca74231ef89f3e96a32fb5e4c1c2c678d84b236a1d2362f5ad8f07c03facb
+738146583d1b91385c04b8ac1ee5b6c006931b54bfc831842df920274c781e5d
diff --git a/documentation/tests/exchange--password--associated-only--hello--with-associated.txt b/documentation/tests/exchange--password--associated-only--hello--with-associated.txt
index 271dfe9..38b39f3 100644
--- a/documentation/tests/exchange--password--associated-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--associated-only--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --associated context --associated testing
 
-003231c53b93e1969ba1878eb3bb9f5024a7992672b68510d1abb13600f0f9c8
+2ec4c4b9944c79b24a82f0172f317896796e957932b1cf834aa301925523d21e
diff --git a/documentation/tests/exchange--password--associated-only--hello.txt b/documentation/tests/exchange--password--associated-only--hello.txt
index 75beaf9..7e0d558 100644
--- a/documentation/tests/exchange--password--associated-only--hello.txt
+++ b/documentation/tests/exchange--password--associated-only--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --associated context
 
-bae38c6428ebbb4cc925bc18abb393c0de03945ebfe62714d7443ffcbda9f411
+171753d026f50ec447a7b7947a9b15c77081223f1aa89d342d13a2d8fd8c33ba
diff --git a/documentation/tests/exchange--password--associated-only--notice.txt b/documentation/tests/exchange--password--associated-only--notice.txt
index 383994f..c3f9ff6 100644
--- a/documentation/tests/exchange--password--associated-only--notice.txt
+++ b/documentation/tests/exchange--password--associated-only--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --associated context
 
-698c9da5e0748997f1e89870b06dae257795f9a5b3784562588f2779244aad52
+2a7b7ba4951c55951ab36273b0e243d86c06856e8b19eefc87cdd1d0294927f5
diff --git a/documentation/tests/exchange--password--ballast-only--empty.txt b/documentation/tests/exchange--password--ballast-only--empty.txt
index 4d357de..453f488 100644
--- a/documentation/tests/exchange--password--ballast-only--empty.txt
+++ b/documentation/tests/exchange--password--ballast-only--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348
 
-26c625cb89672834b44dfe504428f44e4c7053bceb975e80c4bf88a47fdef3c9
+ec7c8ff8170fa3bf04d89faed6cef68bcf904cabd37133634f1b397bd6a5a47b
diff --git a/documentation/tests/exchange--password--ballast-only--hello--with-associated.txt b/documentation/tests/exchange--password--ballast-only--hello--with-associated.txt
index ab9a1ec..6600c4a 100644
--- a/documentation/tests/exchange--password--ballast-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--ballast-only--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348 --associated testing
 
-69063c56f3fb435ca0723be635a79f87e258c23961b8bd3ecf5ca753d0bfe8a7
+dac5f776ef67b4a2aea15558ef09c304cf5afbe4a5597737b51e4e7b89b9d0c7
diff --git a/documentation/tests/exchange--password--ballast-only--hello.txt b/documentation/tests/exchange--password--ballast-only--hello.txt
index d13037f..b1730e8 100644
--- a/documentation/tests/exchange--password--ballast-only--hello.txt
+++ b/documentation/tests/exchange--password--ballast-only--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348
 
-ab427f2c2a61e43797b76bfd7f4defd042cbd8f46d0e87fd405eddbc0fa07322
+762666a607ed6cd900b051e34ee2c5bcccef6d5e0f7957f016a176e2f5ed4434
diff --git a/documentation/tests/exchange--password--ballast-only--notice.txt b/documentation/tests/exchange--password--ballast-only--notice.txt
index 244a6b1..b4f7ae0 100644
--- a/documentation/tests/exchange--password--ballast-only--notice.txt
+++ b/documentation/tests/exchange--password--ballast-only--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ballast ztxbl1ah428t6ux086pfdgv5d5z8fle06rll5azaglg8gcnvd65mup65qqckq348
 
-965901d07a63a202633a6dc6b3fb6e342e939e1e97849b3e31b119e3645709b9
+995a13d2a40314433c310782fa8b313076eb355ab3c2fec5f041406154276774
diff --git a/documentation/tests/exchange--password--loops--none--hello.txt b/documentation/tests/exchange--password--loops--none--hello.txt
new file mode 100644
index 0000000..ebc824a
--- /dev/null
+++ b/documentation/tests/exchange--password--loops--none--hello.txt
@@ -0,0 +1,3 @@
+>>  z-tokens exchange password --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+fa04f3463a38d5dd870cf3d08b45582cb1c45a7e8060157bb7f3aa25e04730b2
diff --git a/documentation/tests/exchange--password--loops--with-1--hello.txt b/documentation/tests/exchange--password--loops--with-1--hello.txt
new file mode 100644
index 0000000..54b9eb1
--- /dev/null
+++ b/documentation/tests/exchange--password--loops--with-1--hello.txt
@@ -0,0 +1,3 @@
+>>  z-tokens exchange password --derivation-loops 1 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+fa04f3463a38d5dd870cf3d08b45582cb1c45a7e8060157bb7f3aa25e04730b2
diff --git a/documentation/tests/exchange--password--loops--with-2--hello.txt b/documentation/tests/exchange--password--loops--with-2--hello.txt
new file mode 100644
index 0000000..d94f32e
--- /dev/null
+++ b/documentation/tests/exchange--password--loops--with-2--hello.txt
@@ -0,0 +1,3 @@
+>>  z-tokens exchange password --derivation-loops 2 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+be5c74be48fc593353a978cefe51dd8290b81f87e4a066098b053af37c1509a2
diff --git a/documentation/tests/exchange--password--loops--with-3--hello.txt b/documentation/tests/exchange--password--loops--with-3--hello.txt
new file mode 100644
index 0000000..eb10943
--- /dev/null
+++ b/documentation/tests/exchange--password--loops--with-3--hello.txt
@@ -0,0 +1,3 @@
+>>  z-tokens exchange password --derivation-loops 3 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+12acd3e5375bb4c6f58a76d0915432a0ae4b7ceebfdcccbfbc8e4dead50d4622
diff --git a/documentation/tests/exchange--password--loops--with-4--hello.txt b/documentation/tests/exchange--password--loops--with-4--hello.txt
new file mode 100644
index 0000000..7f3805a
--- /dev/null
+++ b/documentation/tests/exchange--password--loops--with-4--hello.txt
@@ -0,0 +1,3 @@
+>>  z-tokens exchange password --derivation-loops 4 --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
+
+975bfae5600124877b193f6a29c404ca6be6806eb734033f8850aa1982769d30
diff --git a/documentation/tests/exchange--password--pin-only--empty.txt b/documentation/tests/exchange--password--pin-only--empty.txt
index 6845426..4b850dc 100644
--- a/documentation/tests/exchange--password--pin-only--empty.txt
+++ b/documentation/tests/exchange--password--pin-only--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --pin 1234
 
-15bb950c5fdbd1d14e84e1af970abacbc5093426256085c737569033f8de4481
+3ca62ed92b0f8311e0f1143ff715806eaad5a2a44981dd7c37959d9723e16983
diff --git a/documentation/tests/exchange--password--pin-only--hello--with-associated.txt b/documentation/tests/exchange--password--pin-only--hello--with-associated.txt
index a5bd91a..a3cc309 100644
--- a/documentation/tests/exchange--password--pin-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--pin-only--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --pin 1234 --associated testing
 
-e7cb94fab817b717c3a5fa5c62b0c917d4c8b7346c0b74e45b391ba179663fe6
+c6a44383ab25df1a2e81d5049d570154700b5872a6f23ea7a157c48f956c05f8
diff --git a/documentation/tests/exchange--password--pin-only--hello.txt b/documentation/tests/exchange--password--pin-only--hello.txt
index 9d27556..40b3d78 100644
--- a/documentation/tests/exchange--password--pin-only--hello.txt
+++ b/documentation/tests/exchange--password--pin-only--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --pin 1234
 
-2f272df3ed1dd975b7e3207c5aaa2963f8b0bb2d3119281c9ae57f2473d7bef8
+aeb5729af0fc53e1b1f93a08b8dbab70a8573c4b7c5e7c5616be8ad98114d70a
diff --git a/documentation/tests/exchange--password--pin-only--notice.txt b/documentation/tests/exchange--password--pin-only--notice.txt
index 6ce0870..df803d5 100644
--- a/documentation/tests/exchange--password--pin-only--notice.txt
+++ b/documentation/tests/exchange--password--pin-only--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --pin 1234
 
-21c043e6076fc6b74c5c354ab1814449fadd74d6c8918e51a0dc41ca4e6e35f9
+0e0b73830d4e20dea91924ab96ec5a7d2de7009607a9b89c315c7f44ae623155
diff --git a/documentation/tests/exchange--password--secret-only--empty.txt b/documentation/tests/exchange--password--secret-only--empty.txt
index d7b972b..549a4cb 100644
--- a/documentation/tests/exchange--password--secret-only--empty.txt
+++ b/documentation/tests/exchange--password--secret-only--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm
 
-bfdcbd67fbdfab266cc059814a10c70204de43354f8bdf57623a4f5ae882dcc2
+d56110819f198b6be3f3202f7cbf46d79767c44e84bfc136e7735014d253937f
diff --git a/documentation/tests/exchange--password--secret-only--hello--with-associated.txt b/documentation/tests/exchange--password--secret-only--hello--with-associated.txt
index 2089c72..ee5cf1b 100644
--- a/documentation/tests/exchange--password--secret-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--secret-only--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm --associated testing
 
-a7aa0e067993255749dd139bf193b8e4d29769433be56e189a4a600cd8fb836e
+bc16ec34c12638bb7aaaa84c6fb03a6da66aade142bc5763fb7be73be910b5a8
diff --git a/documentation/tests/exchange--password--secret-only--hello.txt b/documentation/tests/exchange--password--secret-only--hello.txt
index 2f5e863..1bd41a2 100644
--- a/documentation/tests/exchange--password--secret-only--hello.txt
+++ b/documentation/tests/exchange--password--secret-only--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm
 
-000b1dfc83d93a75ee60e90e3695d4c5de40e205fb4e8b0f1711e473272b3d94
+b0088d2ebbbab2ef9836f5d77185f2418fcbaf93a2464c14450206acec15694b
diff --git a/documentation/tests/exchange--password--secret-only--notice.txt b/documentation/tests/exchange--password--secret-only--notice.txt
index c730693..1d16096 100644
--- a/documentation/tests/exchange--password--secret-only--notice.txt
+++ b/documentation/tests/exchange--password--secret-only--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --secret ztxcs1qvjhy8ftc7fjajtky3mcrgxdlacer2m6sj8hyxcaa2segdcnhjnqj7ylhm
 
-dfb79d0199ea05e12f0660b30d90a3b9732c69410c52cae5c40c15e42ce6c9bc
+1c507746fac74aa101dd7d95b7045521131c7261f1bc84b2319ba30d26993337
diff --git a/documentation/tests/exchange--password--seed-only--empty.txt b/documentation/tests/exchange--password--seed-only--empty.txt
index f376fad..f0ad8b9 100644
--- a/documentation/tests/exchange--password--seed-only--empty.txt
+++ b/documentation/tests/exchange--password--seed-only--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
 
-d92dbc12fdaf411f4ffa73d82c3c85c74377d1546a59e26b7a6fe27b9325b948
+97839216648c992d49d3328dd96b4a94bcdc5a93bb4178a3d515aa3af01e7cae
diff --git a/documentation/tests/exchange--password--seed-only--hello--with-associated.txt b/documentation/tests/exchange--password--seed-only--hello--with-associated.txt
index 07e7b22..20c9029 100644
--- a/documentation/tests/exchange--password--seed-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--seed-only--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx --associated testing
 
-7bc56936c0d1d69784b874a98a7e979f090f037b3ee45e3aa35f3a7af3ffc308
+bc7cb60859579260ce5144e0bf3e5fdc709f3b024256a69bf7594735002cd629
diff --git a/documentation/tests/exchange--password--seed-only--hello.txt b/documentation/tests/exchange--password--seed-only--hello.txt
index 9776f8f..ebc824a 100644
--- a/documentation/tests/exchange--password--seed-only--hello.txt
+++ b/documentation/tests/exchange--password--seed-only--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
 
-c56b7c83d460dd486c66f0f7f8be56e3cdfa486ae38823b2d010068633ecb212
+fa04f3463a38d5dd870cf3d08b45582cb1c45a7e8060157bb7f3aa25e04730b2
diff --git a/documentation/tests/exchange--password--seed-only--notice.txt b/documentation/tests/exchange--password--seed-only--notice.txt
index 208d7e4..9d92a62 100644
--- a/documentation/tests/exchange--password--seed-only--notice.txt
+++ b/documentation/tests/exchange--password--seed-only--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --seed ztxsd1lf6056vl0zl9xk2j5asj7336sskhyqmevsc32t2ct6def5mnwmcqe9kcmx
 
-6c780dc756f94e8bb0d010e3aa61df8bcf22752c9eb6194fd3ed02e268fd9178
+54cbb29ec3c0e07468463d3648a06079bd36fa769df00fb243266f58c3879e5c
diff --git a/documentation/tests/exchange--password--ssh-wrap-only--empty.txt b/documentation/tests/exchange--password--ssh-wrap-only--empty.txt
index 450425f..1610e0b 100644
--- a/documentation/tests/exchange--password--ssh-wrap-only--empty.txt
+++ b/documentation/tests/exchange--password--ssh-wrap-only--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
-dd1c4904bafdf0bd61827ec1e8c92145a8c168117bfbbd262d987f44f2ca5d14
+7113185f6331457a50d00f812715f3c2e2cbd60e82a131e55ea57906c9037bcb
diff --git a/documentation/tests/exchange--password--ssh-wrap-only--hello--with-associated.txt b/documentation/tests/exchange--password--ssh-wrap-only--hello--with-associated.txt
index 360790e..c33c8bc 100644
--- a/documentation/tests/exchange--password--ssh-wrap-only--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--ssh-wrap-only--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8 --associated testing
 
-bba3ed2cb844b9e64f1c6e1996905e5d368cb81b387304c12f6ac89b2aa3a255
+9f548b637e424beaa37e0ddb38a6ddf0921988a99ad671768f81fe9e8e636c47
diff --git a/documentation/tests/exchange--password--ssh-wrap-only--hello.txt b/documentation/tests/exchange--password--ssh-wrap-only--hello.txt
index 93c4154..550b874 100644
--- a/documentation/tests/exchange--password--ssh-wrap-only--hello.txt
+++ b/documentation/tests/exchange--password--ssh-wrap-only--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
-c46b77ef53e7f57b5913b5ada8e15737db3f6906301e8926a3b68ec0145fa69b
+9e2d136ad068effd57a096c30ee3c589e4102c72018c3831a86c9ae0d4436298
diff --git a/documentation/tests/exchange--password--ssh-wrap-only--notice.txt b/documentation/tests/exchange--password--ssh-wrap-only--notice.txt
index 786eff4..79cf51f 100644
--- a/documentation/tests/exchange--password--ssh-wrap-only--notice.txt
+++ b/documentation/tests/exchange--password--ssh-wrap-only--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --ssh-wrap ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
-9db479caa03898207258b12f9fd2918f4582e1fab9c46ae57a31abf0662fe84a
+aaac91be58a2916054469628c90a6fd236e2130f5049bcac00ea2b7f2ac14e51
diff --git a/documentation/tests/exchange--password--x25519-self--empty.txt b/documentation/tests/exchange--password--x25519-self--empty.txt
index 43a5222..2c69a73 100644
--- a/documentation/tests/exchange--password--x25519-self--empty.txt
+++ b/documentation/tests/exchange--password--x25519-self--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m
 
-510041b24cd686c754ed03bc83ba70922bdc0092fa096bef9534cf8883ff1908
+dad03edc2a51a4dcafe90a41cd49491aedd8ae073b7080e17ce92aafde7e7216
diff --git a/documentation/tests/exchange--password--x25519-self--hello--with-associated.txt b/documentation/tests/exchange--password--x25519-self--hello--with-associated.txt
index c053fed..240546d 100644
--- a/documentation/tests/exchange--password--x25519-self--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--x25519-self--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m --associated testing
 
-5e9fd53f13f4a6b0dbcf1bf63c5b6877ac89d5aeee3731f639ef9f3f02e3ec92
+b94d9e5ed83fbe40185464ae9d745ccd8d7ab173d6fd4d14e1caba39468c2be2
diff --git a/documentation/tests/exchange--password--x25519-self--hello.txt b/documentation/tests/exchange--password--x25519-self--hello.txt
index 956a402..c744d29 100644
--- a/documentation/tests/exchange--password--x25519-self--hello.txt
+++ b/documentation/tests/exchange--password--x25519-self--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m
 
-1e9546a6afe0dd2d92f9ad3376d0c6dc1e4260d21842cb9ef90e661882e1fb2e
+fb6d53843f663d1445ec8d8177ec1bead1011187d0d3d8c0f854b5a3383343c8
diff --git a/documentation/tests/exchange--password--x25519-self--notice.txt b/documentation/tests/exchange--password--x25519-self--notice.txt
index f28f342..b58d27e 100644
--- a/documentation/tests/exchange--password--x25519-self--notice.txt
+++ b/documentation/tests/exchange--password--x25519-self--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk17zpadjtunyk3tst6p08e8qk9hpaxvrat595vy3kgtu0t8d8ehazqg5na4m
 
-7fb3e7f1d263703a5e2ca2d18a74f85200e3d8006906747a54ef11a3c49e345e
+45795e4a0c6b32960169513ee9d2cd66da6063b709e236dab23d18d56dcb4839
diff --git a/documentation/tests/exchange--password--x25519-sender-recipient--empty.txt b/documentation/tests/exchange--password--x25519-sender-recipient--empty.txt
index bf87768..20bf02d 100644
--- a/documentation/tests/exchange--password--x25519-sender-recipient--empty.txt
+++ b/documentation/tests/exchange--password--x25519-sender-recipient--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah
 
-2be677d6bbd2e5dfb1916358ac09d7a439a2b780c603a1f6210e61599c9ef3d5
+70ea4a4fb332e208ceabd23b1b557f67c79abb04c890e62a9a6dbc19a6ad51be
diff --git a/documentation/tests/exchange--password--x25519-sender-recipient--hello--with-associated.txt b/documentation/tests/exchange--password--x25519-sender-recipient--hello--with-associated.txt
index e5f7f01..4e9d358 100644
--- a/documentation/tests/exchange--password--x25519-sender-recipient--hello--with-associated.txt
+++ b/documentation/tests/exchange--password--x25519-sender-recipient--hello--with-associated.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah --associated testing
 
-61f9edc96ec8690ee5ec59cfbfba9e66f527d80d2d1295f1cc6a1b6a2799c736
+0d5e145cc8aa51f6bb2da395ead6a7d7ecb499e19927976367e93d81b736c6a0
diff --git a/documentation/tests/exchange--password--x25519-sender-recipient--hello.txt b/documentation/tests/exchange--password--x25519-sender-recipient--hello.txt
index 6e3fc58..c5f8c40 100644
--- a/documentation/tests/exchange--password--x25519-sender-recipient--hello.txt
+++ b/documentation/tests/exchange--password--x25519-sender-recipient--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah
 
-6b5b4e4238c1e21f7abec5393732cbad67fb1a5bf5ab22f3402be3080b23110e
+7b9f1be718b9009ea1bb43c50c644599bad0f91535e3d95d71aaeb8a6dbb44f9
diff --git a/documentation/tests/exchange--password--x25519-sender-recipient--notice.txt b/documentation/tests/exchange--password--x25519-sender-recipient--notice.txt
index 4637709..970215e 100644
--- a/documentation/tests/exchange--password--x25519-sender-recipient--notice.txt
+++ b/documentation/tests/exchange--password--x25519-sender-recipient--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange password --sender ztxsk1szluhkftlf5zee8wfd6v43el6qa9c7f74sn3xaxjrxzh84q7436qhmh920 --recipient ztxrp17qqdhxkytsfp0ugz0h3zxuy4l2hhszxpaqt9cmqndjg8qllxfamszurtah
 
-02ec5f1ab4333ed3a351ee246ab69948ecd5732266b4b6654bc5aaa3d0ca3f56
+329ef1d690137d52adec885376a7aeddc5d6d2c127314e2e12d14a1a8053d896
diff --git a/documentation/tests/exchange--ssh--wrap--empty.txt b/documentation/tests/exchange--ssh--wrap--empty.txt
index 4aefbc7..c0cf1e6 100644
--- a/documentation/tests/exchange--ssh--wrap--empty.txt
+++ b/documentation/tests/exchange--ssh--wrap--empty.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange ssh wrap --key ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
-ed8863a33663d906948666a3d6ecd45fc74fdd3d3a39f7abb3edc190ff733320
+ee872af63d54b47416f28e71aed5351fd1f54ffe4038f57b61dbece99a41cf5d
diff --git a/documentation/tests/exchange--ssh--wrap--hello.txt b/documentation/tests/exchange--ssh--wrap--hello.txt
index 4e3dce9..6cb2664 100644
--- a/documentation/tests/exchange--ssh--wrap--hello.txt
+++ b/documentation/tests/exchange--ssh--wrap--hello.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange ssh wrap --key ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
-9cabfc8277a12171ef5174c577f7a7cf60f8068b83bd861203b35ea39c97f267
+ff81c96ba4680c3dbd6b94c393244ff9445ebacc20f0bc66a3c71bf7b862f05a
diff --git a/documentation/tests/exchange--ssh--wrap--notice.txt b/documentation/tests/exchange--ssh--wrap--notice.txt
index f388a2f..5b10315 100644
--- a/documentation/tests/exchange--ssh--wrap--notice.txt
+++ b/documentation/tests/exchange--ssh--wrap--notice.txt
@@ -1,3 +1,3 @@
 >>  z-tokens exchange ssh wrap --key ztxws1qqqqqzmnwd5z6etyxg6n2vfeqqqqqg9e9nt4vgd7c6s4tgmecj86kwpfpj7nsnnujzq6f4243jl2vecyrsqszf8qds8
 
-c08531a7b36e64a718088630123586a90adf7378892c97a9e0817cfa2b4e2567
+9f54bb80921ab45fad9cb5fb981a0a714a53755cc6ae1bcda3c5a38ac308795c
diff --git a/documentation/tests/tools--help--exchange--decrypt.txt b/documentation/tests/tools--help--exchange--decrypt.txt
index 4b7430b..c4efb04 100644
--- a/documentation/tests/tools--help--exchange--decrypt.txt
+++ b/documentation/tests/tools--help--exchange--decrypt.txt
@@ -148,6 +148,9 @@
   --ballast-lkkrs  {selector}
     **  from Linux Kernel key-retention-service
 
+  --derivation-loops  {count}
+    **  number of derivation loops
+
   -S --ssh-wrap  {string}
     **  shared SSH agent key handle (multiple allowed, in any order, deduplicated)
 
diff --git a/documentation/tests/tools--help--exchange--encrypt.txt b/documentation/tests/tools--help--exchange--encrypt.txt
index 51d26de..08ff94e 100644
--- a/documentation/tests/tools--help--exchange--encrypt.txt
+++ b/documentation/tests/tools--help--exchange--encrypt.txt
@@ -148,6 +148,9 @@
   --ballast-lkkrs  {selector}
     **  from Linux Kernel key-retention-service
 
+  --derivation-loops  {count}
+    **  number of derivation loops
+
   -S --ssh-wrap  {string}
     **  shared SSH agent key handle (multiple allowed, in any order, deduplicated)
 
diff --git a/documentation/tests/tools--help--exchange--password.txt b/documentation/tests/tools--help--exchange--password.txt
index 9a0111e..85a7e9a 100644
--- a/documentation/tests/tools--help--exchange--password.txt
+++ b/documentation/tests/tools--help--exchange--password.txt
@@ -148,6 +148,9 @@
   --ballast-lkkrs  {selector}
     **  from Linux Kernel key-retention-service
 
+  --derivation-loops  {count}
+    **  number of derivation loops
+
   -S --ssh-wrap  {string}
     **  shared SSH agent key handle (multiple allowed, in any order, deduplicated)