Skip to content

Commit d54093e

Browse files
authored
Remove some skips in tests that aren't needed anymore (#10223)
1 parent 71929bd commit d54093e

File tree

3 files changed

+4
-33
lines changed

3 files changed

+4
-33
lines changed

tests/hazmat/primitives/test_dh.py

+4-14
Original file line numberDiff line numberDiff line change
@@ -753,38 +753,33 @@ def test_public_bytes_match(
753753

754754
@pytest.mark.skip_fips(reason="non-FIPS parameters")
755755
@pytest.mark.parametrize(
756-
("key_path", "loader_func", "vec_path", "is_dhx"),
756+
("key_path", "loader_func", "vec_path"),
757757
[
758758
(
759759
os.path.join("asymmetric", "DH", "dhpub.pem"),
760760
serialization.load_pem_public_key,
761761
os.path.join("asymmetric", "DH", "dhkey.txt"),
762-
False,
763762
),
764763
(
765764
os.path.join("asymmetric", "DH", "dhpub.der"),
766765
serialization.load_der_public_key,
767766
os.path.join("asymmetric", "DH", "dhkey.txt"),
768-
False,
769767
),
770768
(
771769
os.path.join("asymmetric", "DH", "dhpub_rfc5114_2.pem"),
772770
serialization.load_pem_public_key,
773771
os.path.join("asymmetric", "DH", "dhkey_rfc5114_2.txt"),
774-
True,
775772
),
776773
(
777774
os.path.join("asymmetric", "DH", "dhpub_rfc5114_2.der"),
778775
serialization.load_der_public_key,
779776
os.path.join("asymmetric", "DH", "dhkey_rfc5114_2.txt"),
780-
True,
781777
),
782778
],
783779
)
784780
def test_public_bytes_values(
785-
self, key_path, loader_func, vec_path, is_dhx, backend
781+
self, key_path, loader_func, vec_path, backend
786782
):
787-
_skip_dhx_unsupported(backend, is_dhx)
788783
key_bytes = load_vectors_from_file(
789784
key_path, lambda pemfile: pemfile.read(), mode="rb"
790785
)
@@ -882,38 +877,33 @@ def test_parameter_bytes_match(
882877
assert serialized == param_bytes
883878

884879
@pytest.mark.parametrize(
885-
("param_path", "loader_func", "vec_path", "is_dhx"),
880+
("param_path", "loader_func", "vec_path"),
886881
[
887882
(
888883
os.path.join("asymmetric", "DH", "dhp.pem"),
889884
serialization.load_pem_parameters,
890885
os.path.join("asymmetric", "DH", "dhkey.txt"),
891-
False,
892886
),
893887
(
894888
os.path.join("asymmetric", "DH", "dhp.der"),
895889
serialization.load_der_parameters,
896890
os.path.join("asymmetric", "DH", "dhkey.txt"),
897-
False,
898891
),
899892
(
900893
os.path.join("asymmetric", "DH", "dhp_rfc5114_2.pem"),
901894
serialization.load_pem_parameters,
902895
os.path.join("asymmetric", "DH", "dhkey_rfc5114_2.txt"),
903-
True,
904896
),
905897
(
906898
os.path.join("asymmetric", "DH", "dhp_rfc5114_2.der"),
907899
serialization.load_der_parameters,
908900
os.path.join("asymmetric", "DH", "dhkey_rfc5114_2.txt"),
909-
True,
910901
),
911902
],
912903
)
913904
def test_public_bytes_values(
914-
self, param_path, loader_func, vec_path, backend, is_dhx
905+
self, param_path, loader_func, vec_path, backend
915906
):
916-
_skip_dhx_unsupported(backend, is_dhx)
917907
key_bytes = load_vectors_from_file(
918908
param_path, lambda pemfile: pemfile.read(), mode="rb"
919909
)

tests/hazmat/primitives/test_rsa.py

-11
Original file line numberDiff line numberDiff line change
@@ -292,17 +292,6 @@ def test_load_pss_keys_strips_constraints(self, path, backend):
292292
signature, b"whatever", padding.PKCS1v15(), hashes.SHA224()
293293
)
294294

295-
@pytest.mark.supported(
296-
only_if=lambda backend: (
297-
not backend._lib.CRYPTOGRAPHY_IS_BORINGSSL
298-
and (
299-
not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_111E
300-
or backend._lib.CRYPTOGRAPHY_IS_LIBRESSL
301-
and not backend._lib.CRYPTOGRAPHY_LIBRESSL_LESS_THAN_380
302-
)
303-
),
304-
skip_message="Does not support RSA PSS loading",
305-
)
306295
def test_load_pss_pub_keys_strips_constraints(self, backend):
307296
key = load_vectors_from_file(
308297
filename=os.path.join(

tests/x509/test_x509.py

-8
Original file line numberDiff line numberDiff line change
@@ -792,14 +792,6 @@ def test_get_revoked_certificate_doesnt_reorder(
792792
assert crl[2].serial_number == 3
793793

794794

795-
@pytest.mark.supported(
796-
only_if=lambda backend: (
797-
not backend._lib.CRYPTOGRAPHY_IS_LIBRESSL
798-
and not backend._lib.CRYPTOGRAPHY_IS_BORINGSSL
799-
and not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_111E
800-
),
801-
skip_message="Does not support RSA PSS loading",
802-
)
803795
class TestRSAPSSCertificate:
804796
def test_load_cert_pub_key(self, backend):
805797
cert = _load_cert(

0 commit comments

Comments
 (0)