diff --git a/Cargo.lock b/Cargo.lock
index 65f6a26f8130..58d70bb75006 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -378,9 +378,9 @@ dependencies = [
 
 [[package]]
 name = "authenticator"
-version = "0.4.0-alpha.3"
+version = "0.4.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c5d49eab8c93b8aea310cef8a7fd0846eb9417e3c31e4f4d6ec7012aae842"
+checksum = "0e6049d26a8bcbee28599bc43e2369fa228dc5d63a0c5ad7739887d330c1228b"
 dependencies = [
  "base64",
  "bitflags",
diff --git a/supply-chain/audits.toml b/supply-chain/audits.toml
index d0e3ae07a4ab..b4de2f733808 100644
--- a/supply-chain/audits.toml
+++ b/supply-chain/audits.toml
@@ -99,7 +99,7 @@ notes = "I maintain this crate and have reviewed every line."
 [[audits.authenticator]]
 who = "John M. Schanck <jschanck@mozilla.com>"
 criteria = "safe-to-deploy"
-version = "0.4.0-alpha.3"
+version = "0.4.0-alpha.4"
 notes = "Maintained by the CryptoEng team at Mozilla."
 
 [[audits.autocfg]]
diff --git a/third_party/rust/authenticator/.cargo-checksum.json b/third_party/rust/authenticator/.cargo-checksum.json
index 4cff4c5baefa..ead06341da0f 100644
--- a/third_party/rust/authenticator/.cargo-checksum.json
+++ b/third_party/rust/authenticator/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"78495716eef6d717573731a0ebb1cd9e08aa8de836f6d909fd01b18394d296ac","Cargo.toml":"c34624d02a27468747e0a911e3e9cd47c84992c047357cad7d3c9a271ea5cdeb","Cross.toml":"8d132da818d48492aa9f4b78a348f0df3adfae45d988d42ebd6be8a5adadb6c3","LICENSE":"e866c8f5864d4cacfe403820e722e9dc03fe3c7565efa5e4dad9051d827bb92a","README.md":"c87d9c7cc44f1dd4ef861a3a9f8cd2eb68aedd3814768871f5fb63c2070806cd","build.rs":"a459ee1ace052f9692817b15c702cb6e5a6dac7c7dfe74fa075662dbcf808dbe","examples/ctap1.rs":"5d88094250acf7d27781584609210e1e1dcebd829aa2bcc46b33946365708c92","examples/ctap2.rs":"2eafc8a046cf1e08d667b47a7b51fd4f906f06e591308bb4943b2e014e7d4d90","examples/ctap2_discoverable_creds.rs":"0a78458a6e739d44a0c73f94f22ac38515b6fde946519e35fe39b7bb8b412d41","examples/main.rs":"26550f1829ba04872837b013c1a2b824d9baebdee6100fc3d8d9c34457699c6b","examples/reset.rs":"7799bdf8643a77b8d067cbc28c00cd7e5d5bb7aea28e8aa33e880f1a67f01507","examples/set_pin.rs":"7b25cdbe1a083cd2b61546816cc840d3522340916d5f936dace2c3eace6aa069","examples/test_exclude_list.rs":"89cfe3ad30db2847db0e0d5c2012a11bcca6a909ebf160e66cb1b60046a3ec22","rustfmt.toml":"ceb6615363d6fff16426eb56f5727f98a7f7ed459ba9af735b1d8b672e2c3b9b","src/authenticatorservice.rs":"337ac3b45180a2b97b5b463d145fd3abb0a66976ff4fd2e8f8793fd1da48defb","src/capi.rs":"0dcb1b853e8c950a45103f646315b5d8d6bf4b94c45ff4bc19ec3d29b4b686a6","src/consts.rs":"8c03c2608a0b71910d154c56c81d070f5c27988d386bed3d090b1690b248e1c9","src/crypto/dummy.rs":"85eca89d6d7290b5b98325e8b502a3dcf8a36814571c41e6cbc32aaaf9052cba","src/crypto/mod.rs":"7cf6e730050dd9109c389ea177d17e2f781cf1328ab2cdf2c55e2f9e3922509e","src/crypto/nss.rs":"1d3b44b1708c80b5d5811ee97a45b0593503537c8a375e9fff0229aaa8d10255","src/crypto/openssl.rs":"7ef05e1d46dda414c3894f354a61343685c3a862ef3164ac6788d3d3e20b28e2","src/crypto/ring.rs":"dd93b8bfafd1c35c7f23b66fb4881b884a60c7fcff964ae8966ff260e283b7c2","src/ctap2-capi.h":"841b27358112c453dabeb06c16c7e58a8b2c6d8c685d8bd8a9af63d9a76a00b2","src/ctap2/attestation.rs":"82c69f81f99db2ba872f74230057bfce20a5affcb27e6f942917e9563f8cad92","src/ctap2/client_data.rs":"9533ee4469109c25ecd093a7e61175f2ea7dede7ccc351f99da573bc422db249","src/ctap2/commands/client_pin.rs":"4d67dbe754dc132de5a65a437e5304459fde0c439ac3591de82dfaefb37d02b9","src/ctap2/commands/get_assertion.rs":"4cd603ddc5c0d8a5e53850c751ce6ae582d4694ff06a3bd9efe0a2e6301c72f3","src/ctap2/commands/get_info.rs":"16e2b7595c8d13cb213d821d80be6e63264fe114ddc8c18a644df9ea1c9bd6fc","src/ctap2/commands/get_next_assertion.rs":"1120b0301197ada11751c4c42fc0a4147368ec5427f62da3868347567d28ba3a","src/ctap2/commands/get_version.rs":"1ea96278bfbdcaff164209d9082a78af5d9cecf44eef7b692e6054bc31ac892d","src/ctap2/commands/make_credentials.rs":"d741148f1519e67683bf29e70d0ab2e045ed676ad628650012a6a12051b434f0","src/ctap2/commands/mod.rs":"2ae842f41730e2b31546e18f913146aceced68cafd7390273493fcc996493d8f","src/ctap2/commands/reset.rs":"006396cc8361ce3d72a28f7578254c02aae63dbb98ce326dc844b3b065b0f97c","src/ctap2/commands/selection.rs":"be878778fbb377976ef61c6d8001c0f69e084ee05ffca1a620057960b548458a","src/ctap2/mod.rs":"dc278046fb6df377cd0fb00aac8b2ed94f19669f3529bc5792dff13605a0cbfc","src/ctap2/server.rs":"64e20830b4d1517875807514535a8a8fae4a91491e92635200ab242a822ef70b","src/ctap2/utils.rs":"ad0aa36a0dbeb510b7f37789329f1957eab206eb529dc083e6176b142984e26e","src/ctap2_capi.rs":"492598c6d1e93a900c7076cfb551c9ff210bdf9323e49f7cb59de4da2cba8268","src/errors.rs":"5f4620dbb1da549ae0c12f49c260c15a33d0ecf0f9f97c018a0e40570f806278","src/lib.rs":"03903890773e6526b667ca961bbec1dadff83922fce54cce1a65da9df617d389","src/manager.rs":"9ef43a69c583e8768d2b161540c7dac289213ad0e0c55ffbbd6d5ea775f74089","src/statecallback.rs":"6b16f97176db1ae3fc3851fe8394e4ffc324bc6fe59313845ac3a88132fd52f1","src/statemachine.rs":"d7d07c512bcf9f4a054982822a13ef87a72d308646d701f7ec878810ea61b9e3","src/status_update.rs":"ccea47e8c2c99450ed397fe8feddba0f2e63705f08b025876afde1d2d54a1162","src/transport/device_selector.rs":"4914fe559f61a3d4aab7e15b9f8ba428f2ea908b6b7bb662ada7b12e60c310a4","src/transport/errors.rs":"0b7e4c3af8cca7d024c9031879ca3a750fd28d4e8dac6e58f5ecb65267f79a0e","src/transport/freebsd/device.rs":"959f2c43a52fabbf04ef0d2adf610bad126fb078141cef95eb813aceb813e59e","src/transport/freebsd/mod.rs":"42dcb57fbeb00140003a8ad39acac9b547062b8f281a3fa5deb5f92a6169dde6","src/transport/freebsd/monitor.rs":"c10b154632fbedc3dca27197f7fc890c3d50ac1744b927e9f1e44a9e8a13506e","src/transport/freebsd/transaction.rs":"eaca1e478eb1c22c908669fc8e1f815bbf4410afdb230ac06a99203d55c99d43","src/transport/freebsd/uhid.rs":"84f564d337637c1cd107ccc536b8fce2230628e144e4031e8db4d7163c9c0cb3","src/transport/hid.rs":"24248cf56e3617e8043c1e81f2fb3d5e7f93b30080f0dc4ebaf78e1ba275a9d5","src/transport/hidproto.rs":"362fc8e24b94ba431aad5ee0002f5a3364badd937c706c0ae119a5a7a2abc7c2","src/transport/linux/device.rs":"7c9ecb1cc5cb4d6191466a92c26a5240db9211a590d42cd43366393728c32676","src/transport/linux/hidraw.rs":"c7a0df9b4e51cb2736218ffffa02b2b2547b7c515d69f9bae2c9a8c8f1cb547b","src/transport/linux/hidwrapper.h":"72785db3a9b27ea72b6cf13a958fee032af54304522d002f56322473978a20f9","src/transport/linux/hidwrapper.rs":"753c7459dbb73befdd186b6269ac33f7a4537b4c935928f50f2b2131756e787d","src/transport/linux/ioctl_aarch64le.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_armle.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_mips64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsle.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64be.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpcbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_riscv64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_s390xbe.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86_64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/mod.rs":"446e435126d2a58f167f648dd95cba28e8ac9c17f1f799e1eaeab80ea800fc57","src/transport/linux/monitor.rs":"448c6e0b7ef649ee0d1253594e1648639d3a5b5616fbf8228d81bd0816bc562c","src/transport/linux/transaction.rs":"bd65fce8864be95839d7918f0fecc065f907265e0ce5411845f409c8e206f9a4","src/transport/macos/device.rs":"79eb3cd92e87dca17127dacf20a900360cade53ddd821ebf09ce7010f5118e35","src/transport/macos/iokit.rs":"7dc4e7bbf8e42e2fcde0cee8e48d14d6234a5a910bd5d3c4e966d8ba6b73992f","src/transport/macos/mod.rs":"333e561554fc901d4f6092f6e4c85823e2b0c4ff31c9188d0e6d542b71a0a07c","src/transport/macos/monitor.rs":"7a14f01634f2a604e22bce3bdb78a89bd0ca49f228f45c29a75f3c38dffd4912","src/transport/macos/transaction.rs":"b034104484c6864668425bbd4499540c3117b0de2e80b0b03ee452d00323ed50","src/transport/mock/device.rs":"56ccd61501034b618de74209dfbc86d82701d5323855b1573bc91a704ae716c5","src/transport/mock/mod.rs":"9c4c87efd19adddc1a91c699a6c328063cfbac5531b76346a5ff92e986aded8f","src/transport/mock/transaction.rs":"be3ed8c389dfa04122364b82515edd76fad6f5d5f72d15cacd45a84fb8397292","src/transport/mod.rs":"0c088c6bf0932155d52bc3b58f0b8823455a389dff159693647fb4bc53b20341","src/transport/netbsd/device.rs":"106262e36bac76c9e2c0a2db92bb23975be051f8b3653c082f859eb9fc0818cd","src/transport/netbsd/fd.rs":"39025cc01e8e894b8c3105aa9f91550e4f755d28b3af6cfe00d256280be025db","src/transport/netbsd/mod.rs":"b1c52aa29537330cebe67427062d6c94871cab2a9b0c04b2305d686f07e88fd5","src/transport/netbsd/monitor.rs":"8ef8a69c3061a238ace5b0752fa2a263096754b40ea381bc5573542234019b0c","src/transport/netbsd/transaction.rs":"48bd87aa447b133e33fd97c33b308e3de51154af05d7414dd2088f70554d49e2","src/transport/netbsd/uhid.rs":"4ea06d0877a306ec30e8ad25d7e2b75e5846505722391b2453a88996446563eb","src/transport/openbsd/device.rs":"ec7f4b8cc70d6ee0d772c73a9d5c0466d5cc394b22ac0b8864ca3c5da5f3988b","src/transport/openbsd/mod.rs":"514274d414042ff84b3667a41a736e78581e22fda87ccc97c2bc05617e381a30","src/transport/openbsd/monitor.rs":"5eb071dd3719ea305eac21ec20596463f63790f8cd1f908a59e3f9cb0b71b5ad","src/transport/openbsd/transaction.rs":"df504c8a02d4b037d4021999876e82562dc382399b3c496c30056669708657ef","src/transport/stub/device.rs":"3e05c88d521828315657d8d864b1ab72e7247eaeb5b8f0e1c6188ce89510b8d6","src/transport/stub/mod.rs":"6a7fec504a52d403b0241b18cd8b95088a31807571f4c0a67e4055afc74f4453","src/transport/stub/transaction.rs":"a3dbea5ccf691cff69278ed8a8ba67d27baba0ea2e1c6a53c9b0b04027283221","src/transport/windows/device.rs":"ca2b5c0e95e8812898169a4f9a1d1fdda9eb5886892429d3c2f6911dc20a2bab","src/transport/windows/mod.rs":"218e7f2fe91ecb390c12bba5a5ffdad2c1f0b22861c937f4d386262e5b3dd617","src/transport/windows/monitor.rs":"f0d70393f2e640c6a3354bc54a7a97216d7b6ad4167f22ad5a5013f39d96457b","src/transport/windows/transaction.rs":"bd65fce8864be95839d7918f0fecc065f907265e0ce5411845f409c8e206f9a4","src/transport/windows/winapi.rs":"23636b523058c0ea87a12d642d0b75fc9ed05cd512c15db6ccca65c3b00d3a76","src/u2fhid-capi.h":"30e37cbc746b682400fcddcede29527635d122fea01e21413e0b63bb58ba4d75","src/u2fprotocol.rs":"858f70d15a3de5a4368b0c5c6e6c919d00b5d378cde66b35cb8f13f825835fad","src/u2ftypes.rs":"96ceec55bb1c31dac2d9ea233de7e66523b43b461f67599c0f81ce4a23cedbc7","src/util.rs":"8332fd9c37611993321ee0b43c0f7364ac16ee4df319b4f855c91a5fdf5e4ba0","src/virtualdevices/mod.rs":"2c7df7691d5c150757304241351612aed4260d65b70ab0f483edbc1a5cfb5674","src/virtualdevices/software_u2f.rs":"83e63c0c4a597e71d87b5cd1f33a49646d00b3062edbdd05c51623b80fb60168","src/virtualdevices/webdriver/mod.rs":"4a36e6dfa9f45f941d863b4039bfbcfa8eaca660bd6ed78aeb1a2962db64be5a","src/virtualdevices/webdriver/testtoken.rs":"7146e02f1a5dad2c8827dd11c12ee408c0e42a0706ac65f139998feffd42570f","src/virtualdevices/webdriver/virtualmanager.rs":"7205a0397833628fc0847aa942a6a314dc1e23306858b546053e0de6a360ebe1","src/virtualdevices/webdriver/web_api.rs":"9032525af458b6fe9a3274c36b6ef8c791ecc4ec46d38ae36583fc9a4535b59d","testing/cross/powerpc64le-unknown-linux-gnu.Dockerfile":"d7463ff4376e3e0ca3fed879fab4aa975c4c0a3e7924c5b88aef9381a5d013de","testing/cross/x86_64-unknown-linux-gnu.Dockerfile":"11c79c04b07a171b0c9b63ef75fa75f33263ce76e3c1eda0879a3e723ebd0c24","testing/run_cross.sh":"cc2a7e0359f210eba2e7121f81eb8ab0125cea6e0d0f2698177b0fe2ad0c33d8","webdriver-tools/requirements.txt":"8236aa3dedad886f213c9b778fec80b037212d30e640b458984110211d546005","webdriver-tools/webdriver-driver.py":"82327c26ba271d1689acc87b612ab8436cb5475f0a3c0dba7baa06e7f6f5e19c"},"package":"671c5d49eab8c93b8aea310cef8a7fd0846eb9417e3c31e4f4d6ec7012aae842"}
\ No newline at end of file
+{"files":{"Cargo.lock":"6fc03c9591e3ef4003ae98808a5f30765af349e080683b0edfdc62056bab683f","Cargo.toml":"e28f81aba2405be542bfeb9c99aa3c823392b6248fe946ed2067255840c3a46c","Cross.toml":"8d132da818d48492aa9f4b78a348f0df3adfae45d988d42ebd6be8a5adadb6c3","LICENSE":"e866c8f5864d4cacfe403820e722e9dc03fe3c7565efa5e4dad9051d827bb92a","README.md":"c87d9c7cc44f1dd4ef861a3a9f8cd2eb68aedd3814768871f5fb63c2070806cd","build.rs":"a459ee1ace052f9692817b15c702cb6e5a6dac7c7dfe74fa075662dbcf808dbe","examples/ctap1.rs":"5d88094250acf7d27781584609210e1e1dcebd829aa2bcc46b33946365708c92","examples/ctap2.rs":"2eafc8a046cf1e08d667b47a7b51fd4f906f06e591308bb4943b2e014e7d4d90","examples/ctap2_discoverable_creds.rs":"0a78458a6e739d44a0c73f94f22ac38515b6fde946519e35fe39b7bb8b412d41","examples/main.rs":"26550f1829ba04872837b013c1a2b824d9baebdee6100fc3d8d9c34457699c6b","examples/reset.rs":"7799bdf8643a77b8d067cbc28c00cd7e5d5bb7aea28e8aa33e880f1a67f01507","examples/set_pin.rs":"7b25cdbe1a083cd2b61546816cc840d3522340916d5f936dace2c3eace6aa069","examples/test_exclude_list.rs":"89cfe3ad30db2847db0e0d5c2012a11bcca6a909ebf160e66cb1b60046a3ec22","rustfmt.toml":"ceb6615363d6fff16426eb56f5727f98a7f7ed459ba9af735b1d8b672e2c3b9b","src/authenticatorservice.rs":"337ac3b45180a2b97b5b463d145fd3abb0a66976ff4fd2e8f8793fd1da48defb","src/capi.rs":"0dcb1b853e8c950a45103f646315b5d8d6bf4b94c45ff4bc19ec3d29b4b686a6","src/consts.rs":"8c03c2608a0b71910d154c56c81d070f5c27988d386bed3d090b1690b248e1c9","src/crypto/dummy.rs":"85eca89d6d7290b5b98325e8b502a3dcf8a36814571c41e6cbc32aaaf9052cba","src/crypto/mod.rs":"7cf6e730050dd9109c389ea177d17e2f781cf1328ab2cdf2c55e2f9e3922509e","src/crypto/nss.rs":"1d3b44b1708c80b5d5811ee97a45b0593503537c8a375e9fff0229aaa8d10255","src/crypto/openssl.rs":"7ef05e1d46dda414c3894f354a61343685c3a862ef3164ac6788d3d3e20b28e2","src/crypto/ring.rs":"dd93b8bfafd1c35c7f23b66fb4881b884a60c7fcff964ae8966ff260e283b7c2","src/ctap2-capi.h":"841b27358112c453dabeb06c16c7e58a8b2c6d8c685d8bd8a9af63d9a76a00b2","src/ctap2/attestation.rs":"82c69f81f99db2ba872f74230057bfce20a5affcb27e6f942917e9563f8cad92","src/ctap2/client_data.rs":"9533ee4469109c25ecd093a7e61175f2ea7dede7ccc351f99da573bc422db249","src/ctap2/commands/client_pin.rs":"d0e412d626bb9bd67969483e2520a8f57fb9982c111735424c8587482593a692","src/ctap2/commands/get_assertion.rs":"4cd603ddc5c0d8a5e53850c751ce6ae582d4694ff06a3bd9efe0a2e6301c72f3","src/ctap2/commands/get_info.rs":"16e2b7595c8d13cb213d821d80be6e63264fe114ddc8c18a644df9ea1c9bd6fc","src/ctap2/commands/get_next_assertion.rs":"1120b0301197ada11751c4c42fc0a4147368ec5427f62da3868347567d28ba3a","src/ctap2/commands/get_version.rs":"1ea96278bfbdcaff164209d9082a78af5d9cecf44eef7b692e6054bc31ac892d","src/ctap2/commands/make_credentials.rs":"d741148f1519e67683bf29e70d0ab2e045ed676ad628650012a6a12051b434f0","src/ctap2/commands/mod.rs":"b763ef48de6ffe06d25f31a8d65755c393a604aac64ba0cb183f7a5bdc67c61b","src/ctap2/commands/reset.rs":"006396cc8361ce3d72a28f7578254c02aae63dbb98ce326dc844b3b065b0f97c","src/ctap2/commands/selection.rs":"be878778fbb377976ef61c6d8001c0f69e084ee05ffca1a620057960b548458a","src/ctap2/mod.rs":"dc278046fb6df377cd0fb00aac8b2ed94f19669f3529bc5792dff13605a0cbfc","src/ctap2/server.rs":"64e20830b4d1517875807514535a8a8fae4a91491e92635200ab242a822ef70b","src/ctap2/utils.rs":"ad0aa36a0dbeb510b7f37789329f1957eab206eb529dc083e6176b142984e26e","src/ctap2_capi.rs":"492598c6d1e93a900c7076cfb551c9ff210bdf9323e49f7cb59de4da2cba8268","src/errors.rs":"5f4620dbb1da549ae0c12f49c260c15a33d0ecf0f9f97c018a0e40570f806278","src/lib.rs":"03903890773e6526b667ca961bbec1dadff83922fce54cce1a65da9df617d389","src/manager.rs":"9ef43a69c583e8768d2b161540c7dac289213ad0e0c55ffbbd6d5ea775f74089","src/statecallback.rs":"6b16f97176db1ae3fc3851fe8394e4ffc324bc6fe59313845ac3a88132fd52f1","src/statemachine.rs":"d7d07c512bcf9f4a054982822a13ef87a72d308646d701f7ec878810ea61b9e3","src/status_update.rs":"ccea47e8c2c99450ed397fe8feddba0f2e63705f08b025876afde1d2d54a1162","src/transport/device_selector.rs":"4914fe559f61a3d4aab7e15b9f8ba428f2ea908b6b7bb662ada7b12e60c310a4","src/transport/errors.rs":"0b7e4c3af8cca7d024c9031879ca3a750fd28d4e8dac6e58f5ecb65267f79a0e","src/transport/freebsd/device.rs":"959f2c43a52fabbf04ef0d2adf610bad126fb078141cef95eb813aceb813e59e","src/transport/freebsd/mod.rs":"42dcb57fbeb00140003a8ad39acac9b547062b8f281a3fa5deb5f92a6169dde6","src/transport/freebsd/monitor.rs":"c10b154632fbedc3dca27197f7fc890c3d50ac1744b927e9f1e44a9e8a13506e","src/transport/freebsd/transaction.rs":"eaca1e478eb1c22c908669fc8e1f815bbf4410afdb230ac06a99203d55c99d43","src/transport/freebsd/uhid.rs":"84f564d337637c1cd107ccc536b8fce2230628e144e4031e8db4d7163c9c0cb3","src/transport/hid.rs":"24248cf56e3617e8043c1e81f2fb3d5e7f93b30080f0dc4ebaf78e1ba275a9d5","src/transport/hidproto.rs":"362fc8e24b94ba431aad5ee0002f5a3364badd937c706c0ae119a5a7a2abc7c2","src/transport/linux/device.rs":"7c9ecb1cc5cb4d6191466a92c26a5240db9211a590d42cd43366393728c32676","src/transport/linux/hidraw.rs":"c7a0df9b4e51cb2736218ffffa02b2b2547b7c515d69f9bae2c9a8c8f1cb547b","src/transport/linux/hidwrapper.h":"72785db3a9b27ea72b6cf13a958fee032af54304522d002f56322473978a20f9","src/transport/linux/hidwrapper.rs":"753c7459dbb73befdd186b6269ac33f7a4537b4c935928f50f2b2131756e787d","src/transport/linux/ioctl_aarch64le.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_armle.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_mips64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_mipsle.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64be.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpc64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_powerpcbe.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/transport/linux/ioctl_riscv64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_s390xbe.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/ioctl_x86_64.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/transport/linux/mod.rs":"446e435126d2a58f167f648dd95cba28e8ac9c17f1f799e1eaeab80ea800fc57","src/transport/linux/monitor.rs":"448c6e0b7ef649ee0d1253594e1648639d3a5b5616fbf8228d81bd0816bc562c","src/transport/linux/transaction.rs":"bd65fce8864be95839d7918f0fecc065f907265e0ce5411845f409c8e206f9a4","src/transport/macos/device.rs":"79eb3cd92e87dca17127dacf20a900360cade53ddd821ebf09ce7010f5118e35","src/transport/macos/iokit.rs":"7dc4e7bbf8e42e2fcde0cee8e48d14d6234a5a910bd5d3c4e966d8ba6b73992f","src/transport/macos/mod.rs":"333e561554fc901d4f6092f6e4c85823e2b0c4ff31c9188d0e6d542b71a0a07c","src/transport/macos/monitor.rs":"7a14f01634f2a604e22bce3bdb78a89bd0ca49f228f45c29a75f3c38dffd4912","src/transport/macos/transaction.rs":"b034104484c6864668425bbd4499540c3117b0de2e80b0b03ee452d00323ed50","src/transport/mock/device.rs":"56ccd61501034b618de74209dfbc86d82701d5323855b1573bc91a704ae716c5","src/transport/mock/mod.rs":"9c4c87efd19adddc1a91c699a6c328063cfbac5531b76346a5ff92e986aded8f","src/transport/mock/transaction.rs":"be3ed8c389dfa04122364b82515edd76fad6f5d5f72d15cacd45a84fb8397292","src/transport/mod.rs":"0c088c6bf0932155d52bc3b58f0b8823455a389dff159693647fb4bc53b20341","src/transport/netbsd/device.rs":"106262e36bac76c9e2c0a2db92bb23975be051f8b3653c082f859eb9fc0818cd","src/transport/netbsd/fd.rs":"39025cc01e8e894b8c3105aa9f91550e4f755d28b3af6cfe00d256280be025db","src/transport/netbsd/mod.rs":"b1c52aa29537330cebe67427062d6c94871cab2a9b0c04b2305d686f07e88fd5","src/transport/netbsd/monitor.rs":"8ef8a69c3061a238ace5b0752fa2a263096754b40ea381bc5573542234019b0c","src/transport/netbsd/transaction.rs":"48bd87aa447b133e33fd97c33b308e3de51154af05d7414dd2088f70554d49e2","src/transport/netbsd/uhid.rs":"4ea06d0877a306ec30e8ad25d7e2b75e5846505722391b2453a88996446563eb","src/transport/openbsd/device.rs":"ec7f4b8cc70d6ee0d772c73a9d5c0466d5cc394b22ac0b8864ca3c5da5f3988b","src/transport/openbsd/mod.rs":"514274d414042ff84b3667a41a736e78581e22fda87ccc97c2bc05617e381a30","src/transport/openbsd/monitor.rs":"5eb071dd3719ea305eac21ec20596463f63790f8cd1f908a59e3f9cb0b71b5ad","src/transport/openbsd/transaction.rs":"df504c8a02d4b037d4021999876e82562dc382399b3c496c30056669708657ef","src/transport/stub/device.rs":"3e05c88d521828315657d8d864b1ab72e7247eaeb5b8f0e1c6188ce89510b8d6","src/transport/stub/mod.rs":"6a7fec504a52d403b0241b18cd8b95088a31807571f4c0a67e4055afc74f4453","src/transport/stub/transaction.rs":"a3dbea5ccf691cff69278ed8a8ba67d27baba0ea2e1c6a53c9b0b04027283221","src/transport/windows/device.rs":"ca2b5c0e95e8812898169a4f9a1d1fdda9eb5886892429d3c2f6911dc20a2bab","src/transport/windows/mod.rs":"218e7f2fe91ecb390c12bba5a5ffdad2c1f0b22861c937f4d386262e5b3dd617","src/transport/windows/monitor.rs":"f0d70393f2e640c6a3354bc54a7a97216d7b6ad4167f22ad5a5013f39d96457b","src/transport/windows/transaction.rs":"bd65fce8864be95839d7918f0fecc065f907265e0ce5411845f409c8e206f9a4","src/transport/windows/winapi.rs":"23636b523058c0ea87a12d642d0b75fc9ed05cd512c15db6ccca65c3b00d3a76","src/u2fhid-capi.h":"30e37cbc746b682400fcddcede29527635d122fea01e21413e0b63bb58ba4d75","src/u2fprotocol.rs":"858f70d15a3de5a4368b0c5c6e6c919d00b5d378cde66b35cb8f13f825835fad","src/u2ftypes.rs":"96ceec55bb1c31dac2d9ea233de7e66523b43b461f67599c0f81ce4a23cedbc7","src/util.rs":"8332fd9c37611993321ee0b43c0f7364ac16ee4df319b4f855c91a5fdf5e4ba0","src/virtualdevices/mod.rs":"2c7df7691d5c150757304241351612aed4260d65b70ab0f483edbc1a5cfb5674","src/virtualdevices/software_u2f.rs":"83e63c0c4a597e71d87b5cd1f33a49646d00b3062edbdd05c51623b80fb60168","src/virtualdevices/webdriver/mod.rs":"4a36e6dfa9f45f941d863b4039bfbcfa8eaca660bd6ed78aeb1a2962db64be5a","src/virtualdevices/webdriver/testtoken.rs":"7146e02f1a5dad2c8827dd11c12ee408c0e42a0706ac65f139998feffd42570f","src/virtualdevices/webdriver/virtualmanager.rs":"7205a0397833628fc0847aa942a6a314dc1e23306858b546053e0de6a360ebe1","src/virtualdevices/webdriver/web_api.rs":"9032525af458b6fe9a3274c36b6ef8c791ecc4ec46d38ae36583fc9a4535b59d","testing/cross/powerpc64le-unknown-linux-gnu.Dockerfile":"d7463ff4376e3e0ca3fed879fab4aa975c4c0a3e7924c5b88aef9381a5d013de","testing/cross/x86_64-unknown-linux-gnu.Dockerfile":"11c79c04b07a171b0c9b63ef75fa75f33263ce76e3c1eda0879a3e723ebd0c24","testing/run_cross.sh":"cc2a7e0359f210eba2e7121f81eb8ab0125cea6e0d0f2698177b0fe2ad0c33d8","webdriver-tools/requirements.txt":"8236aa3dedad886f213c9b778fec80b037212d30e640b458984110211d546005","webdriver-tools/webdriver-driver.py":"82327c26ba271d1689acc87b612ab8436cb5475f0a3c0dba7baa06e7f6f5e19c"},"package":"0e6049d26a8bcbee28599bc43e2369fa228dc5d63a0c5ad7739887d330c1228b"}
\ No newline at end of file
diff --git a/third_party/rust/authenticator/Cargo.lock b/third_party/rust/authenticator/Cargo.lock
index 50a882082d95..eb63401ba907 100644
--- a/third_party/rust/authenticator/Cargo.lock
+++ b/third_party/rust/authenticator/Cargo.lock
@@ -39,7 +39,7 @@ dependencies = [
 
 [[package]]
 name = "authenticator"
-version = "0.4.0-alpha.3"
+version = "0.4.0-alpha.4"
 dependencies = [
  "assert_matches",
  "base64",
diff --git a/third_party/rust/authenticator/Cargo.toml b/third_party/rust/authenticator/Cargo.toml
index d3751d3000ef..b9f09cb300ad 100644
--- a/third_party/rust/authenticator/Cargo.toml
+++ b/third_party/rust/authenticator/Cargo.toml
@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "authenticator"
-version = "0.4.0-alpha.3"
+version = "0.4.0-alpha.4"
 authors = [
     "J.C. Jones <jc@mozilla.com>",
     "Tim Taubert <ttaubert@mozilla.com>",
diff --git a/third_party/rust/authenticator/src/ctap2/commands/client_pin.rs b/third_party/rust/authenticator/src/ctap2/commands/client_pin.rs
index 839fc3127032..c70ce73cb063 100644
--- a/third_party/rust/authenticator/src/ctap2/commands/client_pin.rs
+++ b/third_party/rust/authenticator/src/ctap2/commands/client_pin.rs
@@ -745,6 +745,7 @@ pub enum PinError {
     InvalidPin(Option<u8>),
     PinAuthBlocked,
     PinBlocked,
+    PinNotSet,
     Backend(BackendError),
 }
 
@@ -770,6 +771,7 @@ impl fmt::Display for PinError {
                 f,
                 "PinError: No retries left. Pin blocked. Device needs reset."
             ),
+            PinError::PinNotSet => write!(f, "PinError: Pin needed but not set on device."),
             PinError::Backend(ref e) => write!(f, "PinError: Crypto backend error: {:?}", e),
         }
     }
diff --git a/third_party/rust/authenticator/src/ctap2/commands/mod.rs b/third_party/rust/authenticator/src/ctap2/commands/mod.rs
index a0cd426991a8..788de842baa8 100644
--- a/third_party/rust/authenticator/src/ctap2/commands/mod.rs
+++ b/third_party/rust/authenticator/src/ctap2/commands/mod.rs
@@ -103,13 +103,14 @@ pub(crate) trait PinAuthCommand {
         }
 
         let client_data_hash = self.client_data_hash();
-        let pin_auth = match calculate_pin_auth(dev, &client_data_hash, &self.pin()) {
-            Ok(pin_auth) => pin_auth,
-            Err(e) => {
-                return Err(repackage_pin_errors(dev, e));
-            }
-        };
-        self.set_pin_auth(pin_auth, Some(1)); // TODO(MS): Currently, we only support version 1
+        let (pin_auth, pin_auth_protocol) =
+            match calculate_pin_auth(dev, &client_data_hash, &self.pin()) {
+                Ok((pin_auth, pin_auth_protocol)) => (pin_auth, pin_auth_protocol),
+                Err(e) => {
+                    return Err(repackage_pin_errors(dev, e));
+                }
+            };
+        self.set_pin_auth(pin_auth, pin_auth_protocol);
         Ok(())
     }
 }
@@ -146,7 +147,12 @@ pub(crate) fn repackage_pin_errors<D: FidoDevice>(
         ))) => {
             return AuthenticatorError::PinError(PinError::PinRequired);
         }
-        // TODO(MS): Add "PinNotSet"
+        AuthenticatorError::HIDError(HIDError::Command(CommandError::StatusCode(
+            StatusCode::PinNotSet,
+            _,
+        ))) => {
+            return AuthenticatorError::PinError(PinError::PinNotSet);
+        }
         // TODO(MS): Add "PinPolicyViolated"
         err => {
             return err;
@@ -427,7 +433,7 @@ pub(crate) fn calculate_pin_auth<Dev>(
     dev: &mut Dev,
     client_data_hash: &ClientDataHash,
     pin: &Option<Pin>,
-) -> Result<Option<PinAuth>, AuthenticatorError>
+) -> Result<(Option<PinAuth>, Option<u64>), AuthenticatorError>
 where
     Dev: FidoDevice,
 {
@@ -448,13 +454,16 @@ where
         let pin_command = GetPinToken::new(&info, &shared_secret, &pin)?;
         let pin_token = dev.send_cbor(&pin_command)?;
 
-        Some(
-            pin_token
-                .auth(client_data_hash.as_ref())
-                .map_err(CommandError::Crypto)?,
+        (
+            Some(
+                pin_token
+                    .auth(client_data_hash.as_ref())
+                    .map_err(CommandError::Crypto)?,
+            ),
+            Some(1), // Currently only pin_auth_protocol 1 supported
         )
     } else {
-        None
+        (None, None)
     };
 
     Ok(pin_auth)
diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
index 832c071970e6..ad4d73b93a8e 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -39,7 +39,7 @@ tokio-reactor = { version = "=0.1.3", optional = true }
 # audioipc2-client and audioipc2-server.
 tokio-threadpool = { version = "=0.1.17", optional = true }
 encoding_glue = { path = "../../../../intl/encoding_glue" }
-authenticator = { version = "0.4.0-alpha.3", features = ["gecko"] }
+authenticator = { version = "0.4.0-alpha.4", features = ["gecko"] }
 gkrust_utils = { path = "../../../../xpcom/rust/gkrust_utils" }
 gecko_logger = { path = "../../../../xpcom/rust/gecko_logger" }
 rsdparsa_capi = { path = "../../../../dom/media/webrtc/sdp/rsdparsa_capi" }