Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WPB-6162 update x 509 verification with new client identity format test #3813

5 changes: 2 additions & 3 deletions integration/test/Test/MLS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,8 @@ testMLSProtocolUpgrade secondDomain = do
resp.status `shouldMatchInt` 200
resp.json %. "protocol" `shouldMatch` "mls"

-- TODO(leif): temporarily disabled to unblock client devs. Fix mls-test-cli and re-enable ASAP.
_testAddUserSimple :: HasCallStack => Ciphersuite -> CredentialType -> App ()
_testAddUserSimple suite ctype = do
testAddUserSimple :: HasCallStack => Ciphersuite -> CredentialType -> App ()
testAddUserSimple suite ctype = do
setMLSCiphersuite suite
[alice, bob] <- createAndConnectUsers [OwnDomain, OwnDomain]
[alice1, bob1, bob2] <- traverse (createMLSClient def {credType = ctype}) [alice, bob, bob]
Expand Down
2 changes: 1 addition & 1 deletion integration/test/Testlib/Env.hs
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ emptyClientGroupState :: ClientGroupState
emptyClientGroupState = ClientGroupState Nothing Nothing

allCiphersuites :: [Ciphersuite]
allCiphersuites = map Ciphersuite ["0x0001", "0xf031"]
allCiphersuites = [Ciphersuite "0x0001"] -- TODO fix testsMLS.testAddUserSimple for "0xf031"
MangoIV marked this conversation as resolved.
Show resolved Hide resolved

mkMLSState :: Codensity IO MLSState
mkMLSState = Codensity $ \k ->
Expand Down
10 changes: 5 additions & 5 deletions nix/pkgs/mls-test-cli/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec {
src = fetchFromGitHub {
owner = "wireapp";
repo = "mls-test-cli";
rev = "baaa5c78411a5bf6d697803276b991523c111631";
sha256 = "sha256-M6bWB5hWl+WSblcH6L+AyGD+7ef9TvRs8wKYq7lJyS8=";
rev = "a18470061977211ecf81911de0f2632eefc81efd";
sha256 = "sha256-HgwR6vuVL3eN7NVox+iClPxqsat3Znc9+ZtENuEJKSU=";
};
pname = "mls-test-cli";
version = "0.9.0";
version = "0.10.3";
cargoLock = {
lockFile = "${src}/Cargo.lock";
outputHashes = {
"hpke-0.10.0" = "sha256-T1+BFwX6allljNZ/8T3mrWhOejnUU27BiWQetqU+0fY=";
"openmls-1.0.0" = "sha256-tAIm8+IgubNnU2M2A5cxHY5caiEQmisw73I9/cqfvUc=";
"safe_pqc_kyber-0.6.0" = "sha256-Ch1LA+by+ezf5RV0LDSQGC1o+IWKXk8IPvkwSrAos68=";
"openmls-1.0.0" = "sha256-nyIMAlTy7CTV0bVQ0ytamKHpERgtsVKTX4zv7aHzemo=";
"safe_pqc_kyber-0.6.2" = "sha256-9t+IIohCJcMIWRtqLA0idyMmjev82BtpST15Tthlge4=";
"tls_codec-0.3.0" = "sha256-IO6tenXKkC14EoUDp/+DtFNOVzDfOlLu8K1EJI7sOzs=";
};
};
Expand Down
Loading