diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2019-11-25 22:48:35 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2019-11-26 11:48:35 +0800 |
| commit | 9dc710e65ae08de8ad510a985ad1258aa76a26b3 (patch) | |
| tree | 6f69d1edb3de7f793267f473a504aea8fde6bec7 | |
| parent | 21eb6f4c8b91aa3dabc85c91ee4e0be65e8e061e (diff) | |
| download | cryptography-9dc710e65ae08de8ad510a985ad1258aa76a26b3.tar.gz cryptography-9dc710e65ae08de8ad510a985ad1258aa76a26b3.tar.bz2 cryptography-9dc710e65ae08de8ad510a985ad1258aa76a26b3.zip | |
Get tests passing with latest wycheproof clone (#5076)
* Get tests passing with latest wycheproof clone
* Fix x25519 wycheproof tests
* Fix for acme repo changes
| -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"]) |