Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions clients/go-tuf/go-tuf.xfails
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

# Example: (commented out since the XFAIL is not needed with current go-tuf)
# test_keytype_and_scheme[rsa/rsassa-pss-sha256]

test_mldsa_keytype_and_scheme
10 changes: 10 additions & 0 deletions clients/python-tuf/python_tuf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,18 @@
import shutil
import sys

from securesystemslib.signer import KEY_FOR_TYPE_AND_SCHEME, SSlibKey
from tuf.ngclient import Updater

# ML-DSA is not enable yet: enable to test the test suite
KEY_FOR_TYPE_AND_SCHEME.update(
{
("ml-dsa", "ml-dsa-44/1"): SSlibKey,
("ml-dsa", "ml-dsa-65/1"): SSlibKey,
("ml-dsa", "ml-dsa-87/1"): SSlibKey,
}
)


def init(metadata_dir: str, trusted_root: str) -> None:
"""Initialize local trusted metadata"""
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ lint.select = ["ANN", "DTZ", "E", "F", "FA", "I", "N", "PIE", "PL", "PYI", "RET"
lint.ignore = [
"S101", # assert is fine in pytest tests
"PLR2004", # magic values are ok in a test suite
"PLR0913", # too many arguments
]
9 changes: 9 additions & 0 deletions tuf_conformance/_internal/repository_simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,15 @@
("ed25519", "ed25519"): [
CryptoSigner.generate_ed25519() for _ in range(NUM_SIGNERS)
],
("ml-dsa", "ml-dsa-44/1"): [
CryptoSigner.generate_mldsa(scheme="ml-dsa-44/1") for _ in range(NUM_SIGNERS)
],
("ml-dsa", "ml-dsa-65/1"): [
CryptoSigner.generate_mldsa(scheme="ml-dsa-65/1") for _ in range(NUM_SIGNERS)
],
("ml-dsa", "ml-dsa-87/1"): [
CryptoSigner.generate_mldsa(scheme="ml-dsa-87/1") for _ in range(NUM_SIGNERS)
],
}


Expand Down
4 changes: 1 addition & 3 deletions tuf_conformance/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ def read_xfails(pytestconfig: pytest.Config) -> list[str]:


@pytest.fixture(autouse=True)
def conformance_xfail(
pytestconfig: pytest.Config, request: pytest.FixtureRequest
) -> None:
def conformance_(pytestconfig: pytest.Config, request: pytest.FixtureRequest) -> None:
xfails = read_xfails(pytestconfig)

if request.node.originalname in xfails or request.node.name in xfails:
Expand Down
101 changes: 80 additions & 21 deletions tuf_conformance/test_keys.py

Large diffs are not rendered by default.

Loading