From 390db51910b8064f972b26cc223ffcfb76730f7b Mon Sep 17 00:00:00 2001 From: Kevin Lewi Date: Thu, 26 Aug 2021 03:07:59 -0700 Subject: [PATCH] Updating test vectors based on latest spec changes (#233) --- src/envelope.rs | 6 +- src/lib.rs | 2 +- src/tests/full_test.rs | 57 +++--- src/tests/opaque_test_vectors.rs | 318 +++++++++++++++---------------- 4 files changed, 183 insertions(+), 200 deletions(-) diff --git a/src/envelope.rs b/src/envelope.rs index 03d9752..a14684a 100644 --- a/src/envelope.rs +++ b/src/envelope.rs @@ -25,7 +25,7 @@ use zeroize::Zeroize; const STR_AUTH_KEY: &[u8] = b"AuthKey"; const STR_EXPORT_KEY: &[u8] = b"ExportKey"; const STR_PRIVATE_KEY: &[u8] = b"PrivateKey"; -const STR_OPAQUE_HASH_TO_SCALAR: &[u8] = b"OPAQUE-HashToScalar"; +const STR_OPAQUE_DERIVE_AUTH_KEY_PAIR: &[u8] = b"OPAQUE-DeriveAuthKeyPair"; const NONCE_LEN: usize = 32; @@ -40,7 +40,7 @@ fn build_inner_envelope_internal( let client_static_keypair = KeyPair::::from_private_key_slice( &CS::OprfGroup::scalar_as_bytes(CS::OprfGroup::hash_to_scalar::( &keypair_seed[..], - STR_OPAQUE_HASH_TO_SCALAR, + STR_OPAQUE_DERIVE_AUTH_KEY_PAIR, )?), )?; @@ -58,7 +58,7 @@ fn recover_keys_internal( let client_static_keypair = KeyPair::::from_private_key_slice( &CS::OprfGroup::scalar_as_bytes(CS::OprfGroup::hash_to_scalar::( &keypair_seed[..], - STR_OPAQUE_HASH_TO_SCALAR, + STR_OPAQUE_DERIVE_AUTH_KEY_PAIR, )?), )?; diff --git a/src/lib.rs b/src/lib.rs index 0aa21bd..d6e5d6a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -411,7 +411,7 @@ //! ``` //! If the protocol completes successfully, then the server obtains a `server_login_finish_result.session_key` which is guaranteed to //! match `client_login_finish_result.session_key` (see the [Session Key](#session-key) section). -//! Otherwise, on failure, the [ServerLogin::finish] algorithm outputs the error [InvalidLoginError](errors::PakeError::InvalidLoginError). +//! Otherwise, on failure, the [ServerLogin::finish] algorithm outputs the error [InvalidLoginError](errors::ProtocolError::InvalidLoginError). //! //! # Advanced Usage //! diff --git a/src/tests/full_test.rs b/src/tests/full_test.rs index c713e0c..28c58cc 100644 --- a/src/tests/full_test.rs +++ b/src/tests/full_test.rs @@ -68,40 +68,41 @@ pub struct TestVectorParameters { static STR_PASSWORD: &str = "password"; static STR_CREDENTIAL_IDENTIFIER: &str = "credential_identifier"; +// To regenerate, run: cargo test -- --nocapture generate_test_vectors static TEST_VECTOR: &str = r#" { - "client_s_pk": "e4a2b9e3aee013bf72f35a00847861631c61f5b1f02e3b8e191fcd14f53a1436", - "client_s_sk": "fa12397b47d1b9cac12902a6d5aa751839e7d2eb97338718936724ef5a867106", - "client_e_pk": "50a57787f5cebc6be96834eb2ea4ef35556c1c4c7780161b65724e4a1057d32a", - "client_e_sk": "4d113729710988d19529ab39447726d615e179bf9bcff6c09febe7e18518aa02", - "server_s_pk": "6c381cb5a5c7c8718537793886053f9ffb4e0a6944efc036384344caf16c174e", - "server_s_sk": "df4aace3a5b6b02f54584a5cdfc280b7f381d44f57f25ce4b0008ed92a7c270f", - "server_e_pk": "24f9d4f69de78834757ad9f16b08997a205249e125ad151f979f63380950cb19", - "server_e_sk": "6dc1d8525660605c3abcd86ec8a690f8af3d5bece6ea76d860a0de644d9d6508", - "fake_sk": "db40438a3dea4ee7dde5840af0050fbade18bc2b231b4469b2bf4ce0ebd25206", + "client_s_pk": "520364faf278ac5b407465c8a802ac57bf61ec4bbf3e1c508a39e1667c7cf904", + "client_s_sk": "e30c1ca67d865b65333bd5567a3ea54c6df36d1641953ca4470a886e7117bf06", + "client_e_pk": "1c0344d0e057a1f6651d80b00e188aa35efb4844173c531d186729f81411bc24", + "client_e_sk": "56b7ff7a43c7d6f75d881606f733c12a53af70b35d8c5cd982a8e94a816dfa0d", + "server_s_pk": "bcf39fe745ca2f945c7d75b542bfe4217fe6f481c49b7ce410f4a13079cd0d2b", + "server_s_sk": "cd4a4916bf0226c7fa1f18c97cbf5e0c03d1ae8b74d1155270202d848f4d640e", + "server_e_pk": "e02644fdcb782c335c0c1f801b70f7a873bc2613e3ed2a6ad05103a85dd2ec01", + "server_e_sk": "b9b14238988b6ea6e6aa6e8981a65c45e28ba01ddedf9437aff62a7071a64d09", + "fake_sk": "55ed2b029216bd0953db96c614c737001fc9c79ad4b2c896f2aeebe052e9770a", "credential_identifier": "637265644964656e746966696572", "id_u": "696455", "id_s": "696453", "password": "70617373776f7264", - "blinding_factor": "c8fa84eba32048544608f67a0ab43aebe21ab78ebbddf32e8210b9b7dbc50002", - "oprf_seed": "e6403df8aa116b9b1bc0010506110422ca462bd763fcd9e2dbc2258613acdf0d431e5bb53097f1d4cd35aa5725a4375fa7ff8bdd81b59b4da74782e9c98781e1", - "masking_nonce": "0ab98ae7b94c33c362f9bc47e56ced702a5e118fd7d71c148642c1df3ee95ef0aeab6c5bce7313f86d8b68067d0d6788ff5405c17c230d3c348cb1f1b9af66f0", - "envelope_nonce": "0512216114d8fd3157cc148adc77985aee1868a79181abf1c88fc4b38e972dc8", - "client_nonce": "8f752fbb35518786eb32a951a8d1dc5fb591b0ca752d18d71e8cc05c52d5a199", - "server_nonce": "9f790dea5a443cf4a3b0215f676e733cbfa3eb8d20a95fd1494466f568882bd4", + "blinding_factor": "1d906fc19848da043a39b51b22620802d7df4f11abf994a269d7ada2cc7edd04", + "oprf_seed": "aee2ac3f7c043526f1cbda952f34840482a63afbf959e32f9172343d8b9fe076cd0a87a017f16e6511c37f171cea277d906d6d1dc31a3de4c0cc99c46e76c94c", + "masking_nonce": "62f49aa47625d01466051799e1ba6f99e1916c15fa1cc651867d1bbc55c6c5255269d21a5854a9756ffd8fc33de366da1d715c5de16609f7aa55e7e8ce01c8f5", + "envelope_nonce": "3cf5a62a4ce8ffe7e1da0ac2066597f1d7cd7a91285e8a108943f6beea91b1aa", + "client_nonce": "de58ba7427030a4792107bf9f4a9334599f4e437d97a73ae1db4f1d3f9362879", + "server_nonce": "50d85de8a9a6fb656981a17811db0a381dd98aa37514a90d8abf990b56829daf", "context": "636f6e74657874", - "registration_request": "c4d73dc3087bab36dd9cf0dd6b405e0474d8d12b41a7bd7317ff8ae04416696e", - "registration_response": "9e024b7621ad17a1809d25a3ca47c42eb12cf67e052a453c38ab119f4344ae026c381cb5a5c7c8718537793886053f9ffb4e0a6944efc036384344caf16c174e", - "registration_upload": "a8f448f10d547cd8186cfd7ab33ec055a5bc9f05306fafd6816c84356fb0f8672f0991ad6d648a22b937055e4db6a5fd381cf5e9fa3ed4128338202039b292cdad8ebc3b1bbd332230e4914c7d4c910642f8c22f4494e2e56c99aff79a698759fa12397b47d1b9cac12902a6d5aa751839e7d2eb97338718936724ef5a8671067c616a828ff31a550e31d5fc178d3ac8171b2213967b504513d982ce66c9e93159cc7fe10e845060fcb721b6e681b60f6bb981c12d14ba39d6f3c1a33afe71da", - "credential_request": "c4d73dc3087bab36dd9cf0dd6b405e0474d8d12b41a7bd7317ff8ae04416696e8f752fbb35518786eb32a951a8d1dc5fb591b0ca752d18d71e8cc05c52d5a19950a57787f5cebc6be96834eb2ea4ef35556c1c4c7780161b65724e4a1057d32a", - "credential_response": "9e024b7621ad17a1809d25a3ca47c42eb12cf67e052a453c38ab119f4344ae020ab98ae7b94c33c362f9bc47e56ced702a5e118fd7d71c148642c1df3ee95ef086ce2acd2daf1d9528991d88e4baaa43cf6b93527ba08b1a734471ab11f85b469785dd0b2f144131370c169e81fcffae8febdd7543303f6f6de974274f6018904dde8dc42044718430f2c986266d93f7a56109a7ea85318481ee51f1098ee4de4d260c4b41172ddce3f3d10c1193c972eedfa6cb807c6a198a06620adb5945d66dc1d8525660605c3abcd86ec8a690f8af3d5bece6ea76d860a0de644d9d65089cee765b7149cad46e928a79a294d410fe63f8e4be824dfc00d9a233fc2c4378199ff3e47a208757018a0084f65fb76f9645c10a687a1421a634e8a3fbadb10d49fca58e37e00c4e1963b67798a4577014422b316c0621d5c25584f1a00d8dd3", - "credential_finalization": "6398492ae387d8816552721723fdf602da8d30e39a489a6f373f6a012ae3b27e7f2b9a739f64de3faa1409596cec67cb916d510fbc2bdf2dd48db56bbdd354ee", - "client_registration_state": "c4d73dc3087bab36dd9cf0dd6b405e0474d8d12b41a7bd7317ff8ae04416696ec8fa84eba32048544608f67a0ab43aebe21ab78ebbddf32e8210b9b7dbc5000270617373776f7264", - "client_login_state": "c8fa84eba32048544608f67a0ab43aebe21ab78ebbddf32e8210b9b7dbc500020060c4d73dc3087bab36dd9cf0dd6b405e0474d8d12b41a7bd7317ff8ae04416696e8f752fbb35518786eb32a951a8d1dc5fb591b0ca752d18d71e8cc05c52d5a19950a57787f5cebc6be96834eb2ea4ef35556c1c4c7780161b65724e4a1057d32a00404d113729710988d19529ab39447726d615e179bf9bcff6c09febe7e18518aa028f752fbb35518786eb32a951a8d1dc5fb591b0ca752d18d71e8cc05c52d5a19970617373776f7264", - "server_login_state": "a6e54e3c6f8c98dbcaddcc67bf9835afb398a922a516a854a96342037a4931c46ff55ce773b85a70aa09c89c15c77beb8df0fa528b2b091ce30e88ae3b29306ab476323aac7cc3fe9ef8793c6cea8e1d54d9ea2d663729a3095494572e952ac61180e42793c167951787b3bda61bce732c76dd9a7a11a7c835cbad8b19bdc75bdde7a653389faca8ad458f03faea5d130b374259940f0183f3b666c930c6c7947a0c0cc48d3848da0e2d4be117a3dfb8837f76528bb4ed40ba9412db51fe14eb", - "password_file": "a8f448f10d547cd8186cfd7ab33ec055a5bc9f05306fafd6816c84356fb0f8672f0991ad6d648a22b937055e4db6a5fd381cf5e9fa3ed4128338202039b292cdad8ebc3b1bbd332230e4914c7d4c910642f8c22f4494e2e56c99aff79a698759fa12397b47d1b9cac12902a6d5aa751839e7d2eb97338718936724ef5a8671067c616a828ff31a550e31d5fc178d3ac8171b2213967b504513d982ce66c9e93159cc7fe10e845060fcb721b6e681b60f6bb981c12d14ba39d6f3c1a33afe71da", - "export_key": "d2884167b7fb2a9aca88f606438d2d2c3b99ed086f916f982efe041a8b1d57ddbc6f04f9fd0d4fa2537b0bc645f3280335a9bcc9b99bab12cd301480a7e85a07", - "session_key": "dde7a653389faca8ad458f03faea5d130b374259940f0183f3b666c930c6c7947a0c0cc48d3848da0e2d4be117a3dfb8837f76528bb4ed40ba9412db51fe14eb" + "registration_request": "7ea276a79194704a5056d17c3e2e1751d98b1d1fc5d1d78d11004e9a44c7c52c", + "registration_response": "389fcdd9b327e1ad9eaa30b8ea9db665b49a52b96583c4952f087d21aa47e15abcf39fe745ca2f945c7d75b542bfe4217fe6f481c49b7ce410f4a13079cd0d2b", + "registration_upload": "7a1daeb91dc6af4e8685287922020dda9e4445ddb107aa76f30ef3defec982046c81af9eba7baef5e5dc3aca419a62b207542315edc732834b18fa394cbfa9c210caed864e36bb19cdd7324553b7e35d1a7384f4262a15e38049f910b2ca6baae30c1ca67d865b65333bd5567a3ea54c6df36d1641953ca4470a886e7117bf06383ff4ec0a1f237f70e51cae0f859e7476917cb8d28cda3aeccd970a205a71e20d3e592eaadabc2216d0ed14e494dbf733984e607b6d5f8b68f9b2321ca01b30", + "credential_request": "7ea276a79194704a5056d17c3e2e1751d98b1d1fc5d1d78d11004e9a44c7c52cde58ba7427030a4792107bf9f4a9334599f4e437d97a73ae1db4f1d3f93628791c0344d0e057a1f6651d80b00e188aa35efb4844173c531d186729f81411bc24", + "credential_response": "389fcdd9b327e1ad9eaa30b8ea9db665b49a52b96583c4952f087d21aa47e15a62f49aa47625d01466051799e1ba6f99e1916c15fa1cc651867d1bbc55c6c5257e7d8f435b95456607ec8767840b5c192c1132d78b38cf72511ae4605a8539f570452bbfd864a34a71b635f77c9d7dee227b7906697ab0dea2dda3043672c523a0a2c651e9bbef212e85439c8f227c564470cdb6d9a74ac8b7d2f6f3eba59b43489082c93f17f7de3c2840848e2c5db07bf4a8c5011f6ff01895bcb0a3b10ca0b9b14238988b6ea6e6aa6e8981a65c45e28ba01ddedf9437aff62a7071a64d098eaf6a09f9dd3db7e9ea307c4df21852c24fdd27bc335815afdfa03237facb0834b5d393d8b5d61526d8a61077a345a864020a10be67f46a6a6a02fd86ea05a2f25e262d9fe23bfe9489d5bc585dd4a018fa5dea295e51a7824526b6360cc03a", + "credential_finalization": "eefb1823d84629dc0d9e149dbb07fb115e473d0d3a004e0b2dd20fdb168a7d33423347c07960d272f1fa670f45ca8e6571d3b396661383da8f07380d89488116", + "client_registration_state": "7ea276a79194704a5056d17c3e2e1751d98b1d1fc5d1d78d11004e9a44c7c52c1d906fc19848da043a39b51b22620802d7df4f11abf994a269d7ada2cc7edd0470617373776f7264", + "client_login_state": "1d906fc19848da043a39b51b22620802d7df4f11abf994a269d7ada2cc7edd0400607ea276a79194704a5056d17c3e2e1751d98b1d1fc5d1d78d11004e9a44c7c52cde58ba7427030a4792107bf9f4a9334599f4e437d97a73ae1db4f1d3f93628791c0344d0e057a1f6651d80b00e188aa35efb4844173c531d186729f81411bc24004056b7ff7a43c7d6f75d881606f733c12a53af70b35d8c5cd982a8e94a816dfa0dde58ba7427030a4792107bf9f4a9334599f4e437d97a73ae1db4f1d3f936287970617373776f7264", + "server_login_state": "b54d627533bf9545c5450b4c518e4cb298b118b34383db02ceddd2178683e7201d1e3ffd5eff03bc224a75760cecd10ce0a6514ba4f638fbfc21f968398d159f5f5a78b6309646b6e9ecd5856aa109abdc53d720791f198edde539d19ee7deeb5438f6a1156476d8e11404b344c2a97db92902eb2d77d723defeb3a7d3be1c5e954c3ba56dff507f6d0de3e9c02b1fe3d8935b32fbaa4be2cf5c82225b9e47c931bb51eb04a2a5345914c33a52c3f7d5184b631fe1a5efd4633f433e408589fa", + "password_file": "7a1daeb91dc6af4e8685287922020dda9e4445ddb107aa76f30ef3defec982046c81af9eba7baef5e5dc3aca419a62b207542315edc732834b18fa394cbfa9c210caed864e36bb19cdd7324553b7e35d1a7384f4262a15e38049f910b2ca6baae30c1ca67d865b65333bd5567a3ea54c6df36d1641953ca4470a886e7117bf06383ff4ec0a1f237f70e51cae0f859e7476917cb8d28cda3aeccd970a205a71e20d3e592eaadabc2216d0ed14e494dbf733984e607b6d5f8b68f9b2321ca01b30", + "export_key": "9eaea2ca345b9fac4c7924abe5783d23ac7452d61ebb026d40ecab402178c8669b135783e5dcd148554e9d861fa4af809f1e41c1ccca929000cdb3a78a2dc4fb", + "session_key": "954c3ba56dff507f6d0de3e9c02b1fe3d8935b32fbaa4be2cf5c82225b9e47c931bb51eb04a2a5345914c33a52c3f7d5184b631fe1a5efd4633f433e408589fa" } "#; @@ -481,7 +482,7 @@ fn test_serialization() -> Result<(), ProtocolError> { serde_json::to_string(&client_registration_start_result.message).unwrap(); assert_eq!( registration_request_json, - r#""xNc9wwh7qzbdnPDda0BeBHTY0StBp71zF/+K4EQWaW4=""# + r#""fqJ2p5GUcEpQVtF8Pi4XUdmLHR/F0deNEQBOmkTHxSw=""# ); let registration_request: RegistrationRequest = serde_json::from_str(®istration_request_json).unwrap(); diff --git a/src/tests/opaque_test_vectors.rs b/src/tests/opaque_test_vectors.rs index b91bc76..106eb2b 100644 --- a/src/tests/opaque_test_vectors.rs +++ b/src/tests/opaque_test_vectors.rs @@ -37,18 +37,11 @@ impl CipherSuite for P256Sha256NoSlowHash { type SlowHash = NoOpHash; } -#[derive(PartialEq)] -pub enum EnvelopeMode { - Base, - CustomIdentifier, -} - #[allow(non_snake_case)] pub struct TestVectorParameters { pub dummy_private_key: Vec, pub dummy_masking_key: Vec, pub context: Vec, - pub envelope_mode: EnvelopeMode, pub client_private_key: Option>, pub client_keyshare: Vec, pub client_private_keyshare: Vec, @@ -98,7 +91,6 @@ Hash: SHA512 MHF: Identity KDF: HKDF-SHA512 MAC: HMAC-SHA512 -EnvelopeMode: 01 Group: ristretto255 Context: 4f50415155452d504f43 Nh: 64 @@ -146,25 +138,25 @@ bf8d6503 #### Intermediate Values ~~~ -client_public_key: 100f6f945b57e4a316e46ed7169b6e9e533c35b29128368a9a -40534b09227428 +client_public_key: 2046d15924599adbcb7c03abe00350e9dde62267037eb0d2a9 +59a17b2210eb0f auth_key: 0ee186ac3a0fe0ec45d36c7cc9786934918a58d6a1abce6842a2b7bd0ec 1c0626e64d887622e8937e987bfbe042f904728966e121b01c739c8dbe66beb6241eb randomized_pwd: 22f5e31fbbbf4649f77ebfc92a2ef555fc30a09edc903123d978d e3ca356b85ce2120b0d2735bd772011ecb573e614cd7b1aeeb86ca0ac6b8732c33cdf 7a6816 envelope: 71b8f14b7a1059cdadc414c409064a22cf9e970b0ffc6f1fc6fdd539c46 -767754ed20356eabd714970fc0058aad92414cc26131c7c3f9a0f5baa76c8fc410984 -0921d83e26786e9c5b6a1cbc4458925fd65415547ffd61d2afbcb593a3a82fb1 -handshake_secret: 9dc2e984200002626dac10f89b9d2efe967f68c8eb19612dd6c -2592d531ca5bd443c0548b8cef946f6e99998d810838c0ee99219fe13052beae3dc2c -b157c991 -server_mac_key: 66739820f04e1cddc7090b05d510baf0de4273ebd9e26f6da961b -687dfdc05c6a68a93f81fd6ed7ff19c1c7f95cc76ceb2c680ed4ab2d6a5eb53088abd -3f7a36 -client_mac_key: e0d836ea8e158a50a7cc610ca27eee2fb92187aa7273cb46ee21d -230be82e7efddf742fe127bc95eb6e034a01efe38ae3c4240b0d0f7fa395dfa52032a -0c1cb5 +767759f0fe7ab535b75ff4a01887e30a733091b05cc6ace0fd49309fe3758f57f4d01 +71b270e309d14e59413849c3ed672e076d97d71ceace93dcade9f26712461611 +handshake_secret: 036b0351f1b041d4e2eb6f4104833e3d13db721b9e9ec85d797 +daf354e8e13ce55ceb3756b9a781439e15015712ce9bc0d66caddb5d5d19c4aa6d03b +fd075301 +server_mac_key: 95592913b88470536b3dc7ecb514a17fbb1916e3efa8e64d55639 +7acbc5ed37f654bf860bfa8ae106f73ef9df92f303715bf29c7dc67d49598d8d6640c +4c7ce3 +client_mac_key: bbb5ee19ec9d491094878dd4a458a776557be3d79d078f40bb294 +01f74b80eb8102c65e2cc203c79740bc0e5bb71a138a9efda58f35a486da1835abe63 +38838b oprf_key: 3f76113135e6ca7e51ac5bb3e8774eb84709ad36b8907ec8f7bc3537828 71906 ~~~ @@ -177,33 +169,33 @@ b7a0606d74bc58b03 registration_response: 865f3305ff73be7388313e7a74b5fc277a165ff2895f92 60391057b84c7bc72718d5035fd0a9c1d6412226df037125901a43f4dff660c0549d4 02f672bcc0933 -registration_upload: 100f6f945b57e4a316e46ed7169b6e9e533c35b29128368a -9a40534b09227428dc3b0057603d1c23df7e6f239984604c4b0dfa111528ab0ba3c7f +registration_upload: 2046d15924599adbcb7c03abe00350e9dde62267037eb0d2 +a959a17b2210eb0fdc3b0057603d1c23df7e6f239984604c4b0dfa111528ab0ba3c7f 6ab1ceb11d10aa85433f63bbf30b9b0ae8951653bcd3beb12aa61cf942e6e5b442282 0d810871b8f14b7a1059cdadc414c409064a22cf9e970b0ffc6f1fc6fdd539c467677 -54ed20356eabd714970fc0058aad92414cc26131c7c3f9a0f5baa76c8fc4109840921 -d83e26786e9c5b6a1cbc4458925fd65415547ffd61d2afbcb593a3a82fb1 +59f0fe7ab535b75ff4a01887e30a733091b05cc6ace0fd49309fe3758f57f4d0171b2 +70e309d14e59413849c3ed672e076d97d71ceace93dcade9f26712461611 KE1: e47c1c5e5eed1910a1cbb6420c5edf26ea3c099aaaedcb03599fc311a724d84f 804133133e7ee6836c8515752e24bb44d323fef4ead34cde967798f2e9784f69f6792 6bd036c5dc4971816b9376e9f64737f361ef8269c18f69f1ab555e96d4a KE2: 9692d473e0bde7a1fbb6d2c0e4001ccc58902102857d0e67e5fa44f4b902b17f 54f9341ca183700f6b6acf28dbfe4a86afad788805de49f2d680ab86ff39ed7f7b11e e2cb784efa8e6cbbb9cc6b52b16290e3906235d71b773534c3da1575a00708219fa81 -05b3d2a1292d58d6ea6b0e464c752df6f957a9e34a66de7e5d44db0e48648d414f7b1 -54e52d5f664c1b88dd42a8117b048fb26428a3b86885d2157a7136708494fd92f50c1 -c3f63bd60d0b458254ac54c6e64841be63f1c4459d3bf9c5ec75a8cd571370add249e +05b3d2a1292d58d6ea6b0e464c752df6f957a9e34a66de7e5d44dbdf958070f8a97fa +374af5dd0febfaf9003095e610278b5ba10de7a16816365d2df80cfd566e6f9ea4a93 +968992e9b153fe4196e4c1f5144643eb240575aba49bf9c5ec75a8cd571370add249e 99cb8a8c43f6ef05610ac6e354642bf4fedbf696e77d4749eb304c4d74be9457c5975 -46bc22aed699225499910fc913b3e907129491571e3137ff950f905e6c83db79e5103 -bd8b7c27799d1eac8d8c57fd2f0b913e81411c02bc722b30b4eb4ee3a53fc1b21232b -4218eb0ed00996dc8c841a96 -KE3: 5a4e48d857196ce709b054f7be4e3973f0892abfafc030762bd4be5dbeb342af -b5bf1fd24a7b355f556f9d53f146ebb3729ae693f69fc1f7862a0c11c8ee7c9d +46bc22aed699225499910fc913b3e90712b085f3437e22abbf37e997f507589944fbc +ccb0128441680382a3eec27d1a80bb154296a1f00e10e984dfa7434a7c7db09284261 +12bd54a0063fff8584da1261 +KE3: faac852789872a58c40e406c301655a55806b117c61c5070364561ecdc5f0951 +8c745ca87a13ca20b41116957066aa040a69786b247e811fb92cbc85d8b3d9bb export_key: 47d742be256471ec7a7b0ebc022d6ca016b022a7dcbdd41fa1b6dbfcd 6f88285aee60db87e7c5e5aff87b55904b07137b3d85648bb62d70a18954dd1c66cdd c2 -session_key: e132b5c83951919bc0f22aa4e3b12b4af81831ccf770f318d11c8c0a -854fddf6bbeee72e24114402ff9012cf117bac95dda241b24d055f7ce2750e6975fa2 -22d +session_key: 01905d1312467beaca17c20e64c50c91ca6e756067adebbc38a89efd +9c1305f8eff3c641062755ba156749ea4ac7d9e9a6187791c40adc13473538b470b20 +a67 ~~~ "#, r#" @@ -217,7 +209,6 @@ Hash: SHA512 MHF: Identity KDF: HKDF-SHA512 MAC: HMAC-SHA512 -EnvelopeMode: 01 Group: ristretto255 Context: 4f50415155452d504f43 Nh: 64 @@ -267,8 +258,8 @@ blind_login: e6f161ac189e6873a19a54efca4baa0719e801e336d929d35ca28b5b #### Intermediate Values ~~~ -client_public_key: c8c9f3a9adab66971bbdb230bd44512741a489e333624186ac -a1b0e967011e06 +client_public_key: 64b38be7d1b6cb0e7c50644acb8b326f67167eb164899b1867 +970ab770628643 auth_key: 494f1326c65c057e301f15e619b9e3de553c77132987828ba20026062da a1f18d516ac2e37b1dfc296e21137623856fb3ccba48cc511f143110944848764dfb7 randomized_pwd: a4853e726d14efb03c35686ee2bc67665d02bdccb0c4c02523bf4 @@ -277,15 +268,15 @@ e1398e78b1094195a082b5ebb1b62ac75d06711643e9990c2be0071a42bc21a2b766b envelope: d0c7b0f0047682bd87a87e0c3553b9bcdce7e1ae3348570df20bf274782 9b2d21a6d25b3a1b8a541f47fc4bbe5783c2cc61c77ed389280a05ed2ef8c2c2d03fe 2066bd22ea959c7bb14b5259ee136e86f4d956fbaa2af2f6a326785f21262909 -handshake_secret: aacad16f4fb6ff90e3a6afb4e430a550000f0351cd30aab930c -3118c8aebbf8bcaa5252809b065d19a26ab475214a1c4dd60c28e91ce310b5a79968d -bb87938c -server_mac_key: 58edbb9aa5489765c102470a5287b5036893b8cea58ecc836bd0c -df4a818f41d6cd58c46d64db3548774f2cc651d10f8e152a7fdd47493c90a28b1106c -8d329b -client_mac_key: 57be496bd6fa74ecfed7a8c30a9ee085f3e56dbf0d5c18c9ad8c3 -8799f0ededd9a8af85e59276935da7bc3ddd2a8cf4fa9ea723ea70b6dba1db2872815 -27944a +handshake_secret: 39ec65469f2bbabfa47bdf29f5d3c2f655009cc9ffffa423688 +6b6b0c25cf0e7f677bc2a4f2454ffaa916b1abf3d53c8a76df2b8ec32cd6a579daf09 +e9606088 +server_mac_key: d47c287732202807e20f9309201019fd167aeadb41d6cc28dc7a3 +eb05dd385a9fa2d1737e8719e89ecd3cc1db0bf53dc084bd8a5ab4586d1927679d11e +c42d69 +client_mac_key: e2ff0e615fb1283856e8d68d284245c5e3790272fc83db97f784e +6f90d2c54a0123459c1d5f75c904ee191c5d535dcbbb1df6c1a900f32d3458dfc30dc +518f93 oprf_key: 531b0c7b0a3f90060c28d3d96ef5fecf56e25b8e4bf71c14bc770804c3f b4507 ~~~ @@ -298,8 +289,8 @@ registration_request: ec2927a03ced1220168b6d5a54f0372f813ced8ad3673d5 registration_response: f6e244e131f8cd14bc37a856a933c91128b2498c06540d 2dba3a197ed7d8bd778aa90cb321a38759fc253c444f317782962ca18d33101eab2c8 cda04405a181f -registration_upload: c8c9f3a9adab66971bbdb230bd44512741a489e333624186 -aca1b0e967011e069fabb8544108ec64de2b992935dd5fd9a98441412ccf724bf4853 +registration_upload: 64b38be7d1b6cb0e7c50644acb8b326f67167eb164899b18 +67970ab7706286439fabb8544108ec64de2b992935dd5fd9a98441412ccf724bf4853 c28749d9fd33fb1824b964f616a7fce654e05bb15133bd4a69441dcbfe6a02b8a546e 1b32dbd0c7b0f0047682bd87a87e0c3553b9bcdce7e1ae3348570df20bf2747829b2d 21a6d25b3a1b8a541f47fc4bbe5783c2cc61c77ed389280a05ed2ef8c2c2d03fe2066 @@ -314,17 +305,17 @@ e7cfa2857bdc95991bfccc09b69ed53fd5f173389f4d8786b261b6dfd2fc7c18968dd d283c009a736227e9c1913b394d0d88419c6463970c0c2887bd5890eac805e8657903 f7f8887f5eab9e700414af99bbabe3b6594418e2a3723fa57f7ef652185f89114109f 5a61cc8c9216fdd7398246bb7a0c20e2fbca2d8ae070cdffe5bb4b1c373e71be8e7d8 -f356ee5de37881533f10397bcd84d354450f1409ae0d487a21921d7edbfe34f9e16a8 -ac94f6f83b0d4a78c1fe567ea4bda594d375917e22fe0fc203773bf728eff0309f259 -4ac3f4dc2cf066f4febcca0e -KE3: c3dc494d69ef860b348714fd67a3e6490e5afd493d7212729a96d61e9502f7a8 -202a18be10b513f236b3e7e2e2f62ff25a61525991c81c030836cb1933b7a13d +f356ee5de37881533f10397bcd84d354456350043199df4e4d9b338cbc2314a9f67e5 +9f4334595f5ae18954bfcc2815ba19a0682403d2f1a62bd050851a038a3c0fb5a8179 +6f627dbae98c7e1e4a9a46ff +KE3: 328b7fdd7d94b63093184409b850c7af99a24dd2a4e14dc9c758ed4c7ada94a6 +5a81d394b881e00d99dc6e71cf7acba03d8235f6e681b802b9a48be03f23991f export_key: 7f2e5b749ec5f6ab34663655184f3653275aafd5db070b6aac6afd80a 78309a8ec0f97a2f2cfcc7a971983a914ead081a8a642b65d298c579d3526d2219381 8d -session_key: a07bb20c5ad960af8caf83b112a008a61e10e2475456fd0620a11ea5 -a75706750b72c4943c3985cae5f31969dea9c74192c8bf601e2d062fcb141c89234ff -7be +session_key: 70d8c538c371757e5e63d522a5f5e1329d7024f73fa854f5899733e3 +d2b5afa800e6db4727aec02ca58cee310c7e8f8193f7cdb5a667fe32247711a3c72ca +06a ~~~ "#, ]; @@ -340,7 +331,6 @@ Hash: SHA512 MHF: Identity KDF: HKDF-SHA512 MAC: HMAC-SHA512 -EnvelopeMode: 01 Group: ristretto255 Context: 4f50415155452d504f43 Nh: 64 @@ -356,47 +346,47 @@ Nok: 32 ~~~ client_identity: 616c696365 server_identity: 626f62 -oprf_seed: d3cb00535339fe4063c7ba5506a990c243a2b5c77b06848a0be9a0568c -252fb0d7425382babd267deeed669e56d1d5654c036211f49b42f4489f96f37100779 -f +oprf_seed: 98ee70b2c51d3e89d9c08b00889a1fa8f3947a48dac9ad994e946f408a +2c31250ee34f9d04a7d85661bab11c67048ecfb7a68c657a3df87cff3d09c6af9912a +1 credential_identifier: 31323334 -masking_nonce: 3058799f42516228746821dc8c8530d0e8273ebde81941591d69ca -5aea773090 -client_private_key: 83c9bcc31a9da0ffa4489900d3d1f85bb65c27f26e9ae4e3b -66f6e02e098c503 -client_public_key: 56717b74a5e1770edb14c65f22cee0487046bd96e122ba97da -ffed06c4bf4052 -server_private_key: 8d3a9355f9757e7071b3f836e3fb1461a6436e92971625b17 -cd7e580dd27c009 -server_public_key: 7a464761cb19c8b6e832fdfcfd18779b0edc246fe808f5de6c -e7bdb54df41b67 -server_nonce: 4e2a8098173efa2968036f1762f2e5df41ab976fb1bfb91dae29950 -f8526de4c -server_keyshare: 0e247410004d83d7cbe3af89c62ff03f942127aec4b0084c9eb5 -88e74ce6dd06 -server_private_keyshare: 326345820acc8aacf4948fce775a1fd265e4e93fd579 -cec8177d6389ee379b0a -masking_key: e968bfe56ad934c3e1088115bcbf1af8b405fd0de94cdf301f9192cc -2781de00617e568b14b7235cc1189265811ea354031ea39b62e31a104f181c01d3dae -4b8 -KE1: b61bfe5997b644e9654b7796203831ea9b9e86499c17db3331a40673832c9729 -05603c1acb64ea417c0dabaab858a5f9da046d4a0cdbf092034c00451ccdc6e1ee835 -5c91d5ed7aa5ea75b8a730ba8dc45f6b41ae9713e6aa7126211346e8754 +masking_nonce: 7cb33db5ba8082e4f4bfb830e8e3f525b0ddcb70469b34224758d7 +25ce53ac76 +client_private_key: 21c97ffc56be5d93f86441023b7c8a4b629399933b3f845f5 +852e8c716a60408 +client_public_key: 5cc46fdc0337a684e126f8663deacc67872a7daffc75312a1d +6377783935f932 +server_private_key: 030c7634ae24b9c6d4e2c07176719e7a246850b8e019f1c71 +a23af6bdb847b0b +server_public_key: 1ac449e9cdd633788069cca1aaea36ea359d7c2d493b254e5f +fe8d64212dcc59 +server_nonce: cae1f4fee4ee4ba509fda550ea0421a85762305b1db20e37f4539b2 +327d37b80 +server_keyshare: 5e5c0ac2904c7d9bf38f99e0050594e484b4d8ded8038ef6e0c1 +41a985fa6b35 +server_private_keyshare: a4abffe3bef8082b78323ea4507fbb0ce8105ca62b38 +1919a35767deaa699709 +masking_key: 077adba76f768fd0979f8dc006ca297e7954ebf0e81a893021ee24ac +c35e1a3f4b5e0366c15771133082ec21035ae0ef0d8bcd0e59d26775ae953b9552fdf +bf2 +KE1: 1ef5fc13fa7695e81b5fcadf57eb49a579b10e4f51bbee11afb278608592456b +8837b6c0709160251cbebe0d55e4423554c45da7a8952367cf336eb623379e80dae2f +1e0cd79b733131d499fb9e77efe0f235d73c1f920bdc5816259ad3a7429 ~~~ #### Output Values ~~~ -KE2: 0826f0581be79672ccf51276e4b4079bf05aa94530591b24acbf4106cf2fa34e -3058799f42516228746821dc8c8530d0e8273ebde81941591d69ca5aea77309078577 -13efdc95f69166737cd7a80ead60e1a1f805c1da9cccbc0d29120f34be291518798c7 -00793f232374e66182495b76b388d9e11f479580cc2297da02fecee88a99cea6bc411 -b9467e8bfa9a4006aba7f21b74b4ce3bccd686785878b0ec9b3fc4200228014d5d073 -69d42d1d1b1669ecd2ad8905734ca0a641d8f16667ca4e2a8098173efa2968036f176 -2f2e5df41ab976fb1bfb91dae29950f8526de4c0e247410004d83d7cbe3af89c62ff0 -3f942127aec4b0084c9eb588e74ce6dd0689ffd826511fa128dc90837369bb9ed14d0 -794aa3a6e45d2ef533cf6b7e3b47d963eed736c71c8ca933af078af45f573bd3fb790 -336c9b47cc40f3d7c091a552 +KE2: 2e1bb024ff255d0f35eb7b1f11174b3e60d8aaabb11ea347a6da0c1964594f4f +7cb33db5ba8082e4f4bfb830e8e3f525b0ddcb70469b34224758d725ce53ac76094c0 +aa800d9a0884392e4efbc0479e3cb84a38c9ead879f1ff755ad762c06812b9858f82c +9722acc61b8eb1d156bc994839bf9ed8a760615258d23e0f94fa2cffadc655ed0d6ff +6914066427366019d4e6989b65d13e38e8edc5ae6f82aa1b6a46bfe6ca0256c64d0cf +db50a3eb7676e1d212e155e152e3bbc9d1fae3c679aacae1f4fee4ee4ba509fda550e +a0421a85762305b1db20e37f4539b2327d37b805e5c0ac2904c7d9bf38f99e0050594 +e484b4d8ded8038ef6e0c141a985fa6b3528ef79e28dbd3783322ab69900a43be8919 +a840cfcc5aa31a8f42b6f2a0c1ce1f9fa50c58dc5787a957af588580117b70d304639 +dc68851224301bbbae9cd654 ~~~ "#]; @@ -413,7 +403,6 @@ Hash: SHA256 MHF: Identity KDF: HKDF-SHA256 MAC: HMAC-SHA256 -EnvelopeMode: 01 Group: P256_XMD:SHA-256_SSWU_RO_ Context: 4f50415155452d504f43 Nh: 32 @@ -460,20 +449,20 @@ cd15c478 #### Intermediate Values ~~~ -client_public_key: 02680493263d3bc4c7af455ba1219fd9bbe329fd0c2a0248e8 -7321ded8ff17b386 +client_public_key: 0234cb18fb529a1cd33b4cf6b9330e4a429d8b8fbe8b2c43a0 +d130713a190b3eb7 auth_key: 570a8105a7d86679b4c9d009edc9627af6b17e8b2d2f0d50cbd13ea8a00 82cd7 randomized_pwd: 04f1615bc400765f22f7af1277a0814b5665ad1d4ef9bf1829880 2a0f6b4636b envelope: 2527e48c983deeb54c9c6337fdd9e120de85343dc7887f00248f1acacc4 -a8319890e251c4b6397fb35900ff46ae1df1e86eed2d23005c6b9c61caa4e12af8bf5 -handshake_secret: 56212ac60eca9f917f6a4ce6aefe762743da701b008ec986cd1 -87ff75df5df84 -server_mac_key: 8c7f132b6cd9a7e4ce9171cd469d02dc1ab0e8d96f4e1ddca1718 -55fc723203f -client_mac_key: 348cb4526417423090d386ce43459d652a6489122e27d3953ed47 -5b3ab9cd336 +a831916a15211679ac4d0731e49058f79917d87536c617ab8d7192ac87826a8f76b5f +handshake_secret: 72f5c4fa597d8b722fa6aa5ae837df06fd7a568a1584489c51d +11b1d43b68e46 +server_mac_key: ec74ece1dce2352dd92693f0bcdb543e97d85d9a778078bad935b +ffb6b2b9a65 +client_mac_key: f680934996037732c95caacc9f15910b60e5ebdba63b915ba9eaa +64c944ed47e oprf_key: d153d662a1e7dd4383837aa7125685d2be6f8041472ecbfd610e46952a6 a24f1 ~~~ @@ -486,27 +475,27 @@ e2f0742c8dce85d5fa8 registration_response: 0244211a4d2a067f7a61ed88dff6764856d347465f330d 0e15502700afd1865911025b95a6add1f2f3d038811b5ad3494bed73b1e2500d8dade c592d88406e25c2f2 -registration_upload: 02680493263d3bc4c7af455ba1219fd9bbe329fd0c2a0248 -e87321ded8ff17b3868efb26f2bb390fd23b90c49ae680c4560fbd2b3c4f32891505c +registration_upload: 0234cb18fb529a1cd33b4cf6b9330e4a429d8b8fbe8b2c43 +a0d130713a190b3eb78efb26f2bb390fd23b90c49ae680c4560fbd2b3c4f32891505c ad7d95b7bc58e2527e48c983deeb54c9c6337fdd9e120de85343dc7887f00248f1aca -cc4a8319890e251c4b6397fb35900ff46ae1df1e86eed2d23005c6b9c61caa4e12af8 -bf5 +cc4a831916a15211679ac4d0731e49058f79917d87536c617ab8d7192ac87826a8f76 +b5f KE1: 03884e56429f1ee53559f2e244392eb8f994fd46c8fd9ffdd24ac5a7af963a66 3b967fcded96ed46986e60fcbdf985232639f537377ca3fcf07ad489956b2e9019033 58b4eae039953116889466bfddeb40168e39ed83809fd5f0d5f2de9c5234398 KE2: 0383fff1b3e8003723dff1b1f90a7934a036bd6691aca0366b07a100bf2bb3dc 2acb792f3657240ce5296dd5633e7333531009c11ee6ab46b6111f156d96a160b23b6 a5ff1ce8035a1dca4776f32f43c7ce626d796da0f27fc9897522fc1fab70d2fb443d8 -2a4333770057e929c2f9977d40a64e8b4a5a553d25a8b8392b4adbf0a0a6e87f26165 -0d04084823b23b07d351e3b947778a43859be3ba218b22d054edf8018e88ecfc53891 +2a4333770057e929c2f9977d40a64e8b4a5a553d25a8b8392b4adbf0a03947082b3aa +9836bc20c7dd255e57b7d3a29c9cbee85481ed776cada975dae758018e88ecfc53891 529278c47239f8fe6f1be88972721898ef81cc0a76a0b5500242bc29993976185dacf -6be815cbfa923aac80fad8b7f020c9d4f18e0b6867a171e7fda886b9fd9f3bc9e37c4 -04ca07f7a5c9a6f98df20a5cac42371162731faa -KE3: 86a57a3e1a2e537ea667031091c025cb539826dbbb1756683220dd239d4a7bff +6be815cbfa923aac80fad8b7f020c9d4f18e0b6867a177d92ce531ed6f48a6592d14a +a9e7fee37fa1e8ef1ffb85181e66661196447dc0 +KE3: 00afa7c015df8f9e9dcd491c88a41663320549b163761e11ea5aefb398e470be export_key: a83a3fe26af0dadb63d15ed808a4dc2edb57f45212554ecc1af5e0273 50651de -session_key: e26d54798ce8a66fb415cb67f4d87647dcd3d8aa79a7ab6a5f701b82 -f037b1e3 +session_key: 9cbab7cb765fe14d3a6bbcba0945ff6aaee8db71877842502fd61c24 +2a12384e ~~~ "#, r#" @@ -520,7 +509,6 @@ Hash: SHA256 MHF: Identity KDF: HKDF-SHA256 MAC: HMAC-SHA256 -EnvelopeMode: 01 Group: P256_XMD:SHA-256_SSWU_RO_ Context: 4f50415155452d504f43 Nh: 32 @@ -569,20 +557,20 @@ blind_login: 4308682dc1bdab92ff91bb1a5fc5bc084223fe4369beddca3f1640a6 #### Intermediate Values ~~~ -client_public_key: 02e89507b3a1a946e8096cd7e1e8fbc31e2dd39fecc49580ed -2659262c08ea33eb +client_public_key: 028e38bb4030255ad81d48afba0ae8f8f65169a6ff17f536c8 +91816cd2f47c9e89 auth_key: 76cba5b349c60c5a19ab06b70a3191d3418318b5a203fd298b18a0eda53 efd1a randomized_pwd: 74649c9c7b0d7436c4873984732fe45e19dabd1a96d7e9175468a 85ed16bea65 envelope: 75c245690f9669a9af5699e8b23d6d1fa9e697aeb4526267d942b842e44 26e423938d818ea53f58fdaab8541765d5171e99b1bdc2c63e8e1eaf62d3a60aacabe -handshake_secret: 22f608959308cb4dff55cf77c006ea8e9bc66df75d7076a927a -3d21d3fce5562 -server_mac_key: 76e1415cfcf0ff271533fdd4ce4fffb4110ba1ff4aa9a02a1734d -9ae0e0ce47a -client_mac_key: 9341b0b36ac36875910cd1260cd8dc6d6cd58e0fb6503fece6524 -11b6f627bf7 +handshake_secret: 77ef201cd5f558cd2b184d5bc63e28ad2fe6171c4967e8962b7 +83f0c9e9c5aea +server_mac_key: accc90a00130230aaee45ed5ff69dcb257d3dda31519ef7ed3fa7 +575b6c8072d +client_mac_key: 8471a38dd92988b8d5139ffac80873921c01f34b9be332d819624 +73218e10578 oprf_key: f14e1fc34ba1218bfd3f7373f036889bf4f35a8fbc9e8c9c07ccf2d2388 79d9c ~~~ @@ -595,8 +583,8 @@ b6783170c9ad68f6052 registration_response: 03cc3491b4bcb3e4804f3eadbc6a04c8fff18cc9ca5a4f eeb577fdfebd71f5060f029a2c6097fbbcf3457fe3ff7d4ef8e89dab585a67dfed090 5c9f104d909138bae -registration_upload: 02e89507b3a1a946e8096cd7e1e8fbc31e2dd39fecc49580 -ed2659262c08ea33eb260603b2690f3d466fb0b747e256283bed94836ac98c10d4588 +registration_upload: 028e38bb4030255ad81d48afba0ae8f8f65169a6ff17f536 +c891816cd2f47c9e89260603b2690f3d466fb0b747e256283bed94836ac98c10d4588 1372046d3b1e875c245690f9669a9af5699e8b23d6d1fa9e697aeb4526267d942b842 e4426e423938d818ea53f58fdaab8541765d5171e99b1bdc2c63e8e1eaf62d3a60aac abe @@ -609,13 +597,13 @@ KE2: 035115b21dde0992cb812926d65c7dccd5e0f8ffff573da4a7c1e603e0e40827 f97ced10bd1592793497e58b5d05a02ebf003f8a8949a2f8a22a09e4d1b8ba19c9e77 4b6f31545ac4c02aba4ad8e26b4f43d65319f8d1c5a5a04668d4b581ac468101aee52 8cc6b69daac7a90de8837d49708e76310767cbe4af18594d022aa8746ab4329d59129 -6652d44f6dfb04470103311bacd7ad51060ef5abac41bbe51a3c1deeeab8ded9273ad -681001416cbb6d1f0976548f36d1ddb1d3b1f948 -KE3: 5770a1ce912fecf1fa339fe1646b2abfe8dd683767c885a0f1dedba8dfab653e +6652d44f6dfb04470103311bacd7ad51060ef5abac41b2a2eb8e68a375b1d2f55c77c +db2d1cb355df3ca50a966c3582f16a76e518e2ad +KE3: 9656352a2ae1c1569ff6bb69c5d533fff9aa174faad1f3980eaa3e6d0df2102e export_key: 5b92e3454d59062460a87ad2ff6546d862f722c6fbd7678a0997b3c9d c61e9a0 -session_key: 3a04636e2c14b4ef3a01070a2ff129cd2248318d8b85d6c4368f5115 -0f0348ff +session_key: 7d9430d675055a95b323a012be00690382618f4f687cbe0c5f7c4d20 +b1fb71c1 ~~~ "#, ]; @@ -632,7 +620,6 @@ Hash: SHA256 MHF: Identity KDF: HKDF-SHA256 MAC: HMAC-SHA256 -EnvelopeMode: 01 Group: P256_XMD:SHA-256_SSWU_RO_ Context: 4f50415155452d504f43 Nh: 32 @@ -648,43 +635,43 @@ Nok: 32 ~~~ client_identity: 616c696365 server_identity: 626f62 -oprf_seed: 42cd4f606841ca8f403920a8ecf2d60399962f49d83f857ca86676b272 -1c4366 +oprf_seed: f7664fae89be455ee3350b04a85eab390b2dc63256fbd311d8de944b45 +b859e6 credential_identifier: 31323334 -masking_nonce: d3974af728aeafc9e5af4b4cab57d7e7dfbe0ef6b08df28fae5269 -229cac2332 -client_private_key: 0e6b97ef90ea8cedbada0e1295233ba417790ed8e99676903 -71d527ddad59a64 -client_public_key: 033043e30c3dd5fb22d0b3d167acc28878ea7c3ac49cf82b2e -b4b60a8299a67f7a -server_private_key: b08b686382820021a7d32ad3cb8ff60f15437b5cb00c53f21 -f3fa17ac31d2bc0 -server_public_key: 03983ac5783e6a460a526066f1398cdc648518a985cc26a66f -c7573a71ce36dbe5 -server_nonce: 1a60a3e31bb007db74b7114aab2f196ef6bec942a9b4fe6c61143fa -c34d42143 -server_keyshare: 03eefd21dd74c665064ebcbf63ac5ebce9a45097d47dfc08d845 -52a105419b44aa -server_private_keyshare: 751e5012ba0c535e008b2389bea166a5d59a49353f12 -20f5e345f0546463ccdf -masking_key: 5b8caab90accd4f239e85ec978f6a6346edc0019c5671e81034ead61 -5ce096fc -KE1: 028bc054fff79a9e0f0315e31cc035384aedd9d50ea8ee36630d39876ca4e592 -93d797d24fe5ad528130825016bfdc2eeaeef19914c366a615bcdbefd1f04b7208023 -843b78440c0e79d828ac4c2658d1cedf7e9795f2242527a4c1a254501d2ca1a +masking_nonce: 21cd364318a92b2afbfccea5d80d337f07defe40d92673a52f3844 +058f5d949a +client_private_key: 41ffab7c86e2b0916361fb6a69f9a097e3ef2f83f8fd5f95c +c79432eabf3e020 +client_public_key: 0251bc2a7e0cb7c043eec5ee7d1b769b69f85b0fa19d1ae907 +5416e93fa01689de +server_private_key: 61764783412278e6ce3c6c66f1995a2a30b5824be6a6d31ca +d35a578ec3d9353 +server_public_key: 03727dd31712275905b1a3cca3bbb33bc71034a1d0c3801be0 +20541933dd497f18 +server_nonce: 2b772c1eb569cc2b57741bf3be630e377c8245b11d0b6ad1fe1d606 +490c27208 +server_keyshare: 02a59205c836a2ab86e19dbd9a417818052179e9a5c99221e2d1 +d8a780dfe4734d +server_private_keyshare: e8c25741b201c2ba00abe390e5a3933a75efdb71b50e +1e0087cc7235f6f9448a +masking_key: 5bb4d884375d7dcbd562a62190cc569ccc809cff9d5aa5e176d48e96 +46b558eb +KE1: 031ac7e5c8099fcb7de5ad5b6cf33ff53078dbee1da64f15f6cd53b2afe6e332 +06a91c9485d74c9010185f462ce1eec52f588a8e392f36915849b6bfcb6bd5b904037 +6a35db8f7e582569dba2e573c4af1462f91c59a9bdee253ed13f60108746252 ~~~ #### Output Values ~~~ -KE2: 0353685a152940706b1ed877b2da12f3c9f417d38fab56f3228c60f72429f602 -d9d3974af728aeafc9e5af4b4cab57d7e7dfbe0ef6b08df28fae5269229cac23329a9 -93151e43ac41ce18939444cea5d012b8a8316ed439d6fccf06b064f7564722f555750 -61897fbb6051f37e3247d08804437259fb9b022cc12715caca4ac12ef7a8b2f101269 -37619ce4725e6b821de5f44ddb71a8582883aa9b5aaefa9e3d0231a60a3e31bb007db -74b7114aab2f196ef6bec942a9b4fe6c61143fac34d4214303eefd21dd74c665064eb -cbf63ac5ebce9a45097d47dfc08d84552a105419b44aadb37380855acdd939b7eb300 -708d78b17ff0f99cee4ca4777c7628fb8ff591d1 +KE2: 02200f91b03819f6a4b0957216fc94a2230d75d0e1be1fe0ced9434b0ec9d23a +5621cd364318a92b2afbfccea5d80d337f07defe40d92673a52f3844058f5d949a604 +39294e7567fc29643e0d5c8799d0dffbbfc8609558b982012fa90aef2ce52b1ffdd8f +96bda49f5306ae346cd745812d3a953ff94712e4ed0acc67c99b432860e337fe3234b +ba88415ac55368b938106cca4049b5c13496fe167d3a092bd990e2b772c1eb569cc2b +57741bf3be630e377c8245b11d0b6ad1fe1d606490c2720802a59205c836a2ab86e19 +dbd9a417818052179e9a5c99221e2d1d8a780dfe4734d7325a81225091665460460ec +37fcf0431f738ba6cb80b63756ee70c6e43aeae5 ~~~ "#]; @@ -758,11 +745,6 @@ fn populate_test_vectors(values: &Value) -> TestVectorParameter ), dummy_masking_key: parse_default!(values, "masking_key", vec![0u8; 64]), context: parse!(values, "Context"), - envelope_mode: match values["EnvelopeMode"].as_str() { - Some("01") => EnvelopeMode::Base, - Some("02") => EnvelopeMode::CustomIdentifier, - _ => panic!("Could not match envelope mode"), - }, client_private_key: decode(values, "client_private_key"), client_keyshare: parse!(values, "client_keyshare"), client_private_keyshare: parse!(values, "client_private_keyshare"),