@@ -753,38 +753,33 @@ def test_public_bytes_match(
753
753
754
754
@pytest .mark .skip_fips (reason = "non-FIPS parameters" )
755
755
@pytest .mark .parametrize (
756
- ("key_path" , "loader_func" , "vec_path" , "is_dhx" ),
756
+ ("key_path" , "loader_func" , "vec_path" ),
757
757
[
758
758
(
759
759
os .path .join ("asymmetric" , "DH" , "dhpub.pem" ),
760
760
serialization .load_pem_public_key ,
761
761
os .path .join ("asymmetric" , "DH" , "dhkey.txt" ),
762
- False ,
763
762
),
764
763
(
765
764
os .path .join ("asymmetric" , "DH" , "dhpub.der" ),
766
765
serialization .load_der_public_key ,
767
766
os .path .join ("asymmetric" , "DH" , "dhkey.txt" ),
768
- False ,
769
767
),
770
768
(
771
769
os .path .join ("asymmetric" , "DH" , "dhpub_rfc5114_2.pem" ),
772
770
serialization .load_pem_public_key ,
773
771
os .path .join ("asymmetric" , "DH" , "dhkey_rfc5114_2.txt" ),
774
- True ,
775
772
),
776
773
(
777
774
os .path .join ("asymmetric" , "DH" , "dhpub_rfc5114_2.der" ),
778
775
serialization .load_der_public_key ,
779
776
os .path .join ("asymmetric" , "DH" , "dhkey_rfc5114_2.txt" ),
780
- True ,
781
777
),
782
778
],
783
779
)
784
780
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
786
782
):
787
- _skip_dhx_unsupported (backend , is_dhx )
788
783
key_bytes = load_vectors_from_file (
789
784
key_path , lambda pemfile : pemfile .read (), mode = "rb"
790
785
)
@@ -882,38 +877,33 @@ def test_parameter_bytes_match(
882
877
assert serialized == param_bytes
883
878
884
879
@pytest .mark .parametrize (
885
- ("param_path" , "loader_func" , "vec_path" , "is_dhx" ),
880
+ ("param_path" , "loader_func" , "vec_path" ),
886
881
[
887
882
(
888
883
os .path .join ("asymmetric" , "DH" , "dhp.pem" ),
889
884
serialization .load_pem_parameters ,
890
885
os .path .join ("asymmetric" , "DH" , "dhkey.txt" ),
891
- False ,
892
886
),
893
887
(
894
888
os .path .join ("asymmetric" , "DH" , "dhp.der" ),
895
889
serialization .load_der_parameters ,
896
890
os .path .join ("asymmetric" , "DH" , "dhkey.txt" ),
897
- False ,
898
891
),
899
892
(
900
893
os .path .join ("asymmetric" , "DH" , "dhp_rfc5114_2.pem" ),
901
894
serialization .load_pem_parameters ,
902
895
os .path .join ("asymmetric" , "DH" , "dhkey_rfc5114_2.txt" ),
903
- True ,
904
896
),
905
897
(
906
898
os .path .join ("asymmetric" , "DH" , "dhp_rfc5114_2.der" ),
907
899
serialization .load_der_parameters ,
908
900
os .path .join ("asymmetric" , "DH" , "dhkey_rfc5114_2.txt" ),
909
- True ,
910
901
),
911
902
],
912
903
)
913
904
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
915
906
):
916
- _skip_dhx_unsupported (backend , is_dhx )
917
907
key_bytes = load_vectors_from_file (
918
908
param_path , lambda pemfile : pemfile .read (), mode = "rb"
919
909
)
0 commit comments