diff options
| -rwxr-xr-x | .travis/downstream.d/certbot.sh | 4 | ||||
| -rw-r--r-- | tests/wycheproof/test_ecdh.py | 1 | ||||
| -rw-r--r-- | tests/wycheproof/test_x25519.py | 4 | 
3 files changed, 6 insertions, 3 deletions
diff --git a/.travis/downstream.d/certbot.sh b/.travis/downstream.d/certbot.sh index 6061e310..12425fb8 100755 --- a/.travis/downstream.d/certbot.sh +++ b/.travis/downstream.d/certbot.sh @@ -5,8 +5,8 @@ case "${1}" in          git clone --depth=1 https://github.com/certbot/certbot          cd certbot          git rev-parse HEAD -        pip install -e acme[dev] -        pip install -e .[dev] +        pip install -e ./acme[dev] +        pip install -e ./certbot[dev]          ;;      run)          cd certbot diff --git a/tests/wycheproof/test_ecdh.py b/tests/wycheproof/test_ecdh.py index 5fcc45b7..b89dc68c 100644 --- a/tests/wycheproof/test_ecdh.py +++ b/tests/wycheproof/test_ecdh.py @@ -21,6 +21,7 @@ _CURVES = {      "secp256r1": ec.SECP256R1(),      "secp384r1": ec.SECP384R1(),      "secp521r1": ec.SECP521R1(), +    "secp224k1": None,      "secp256k1": ec.SECP256K1(),      "brainpoolP224r1": None,      "brainpoolP256r1": ec.BrainpoolP256R1(), diff --git a/tests/wycheproof/test_x25519.py b/tests/wycheproof/test_x25519.py index 991daaa4..29579467 100644 --- a/tests/wycheproof/test_x25519.py +++ b/tests/wycheproof/test_x25519.py @@ -19,7 +19,9 @@ from cryptography.hazmat.primitives.asymmetric.x25519 import (  )  @pytest.mark.wycheproof_tests("x25519_test.json")  def test_x25519(backend, wycheproof): -    assert list(wycheproof.testgroup.items()) == [("curve", "curve25519")] +    assert set(wycheproof.testgroup.items()) == { +        ("curve", "curve25519"), ("type", "XdhComp") +    }      private_key = X25519PrivateKey.from_private_bytes(          binascii.unhexlify(wycheproof.testcase["private"])  | 
