Skip to content

Commit 69a2a46

Browse files
committed
adapted based on tests
1 parent db7eab9 commit 69a2a46

File tree

5 files changed

+3
-65
lines changed

5 files changed

+3
-65
lines changed

tests/hazmat/primitives/test_pkcs7.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ def test_load_pkcs7_empty_certificates(self):
135135

136136
def _load_cert_key():
137137
key = load_vectors_from_file(
138-
os.path.join("pkcs7", "ca_key.pem"),
138+
os.path.join("x509", "custom", "ca", "ca_key.pem"),
139139
lambda pemfile: serialization.load_pem_private_key(
140140
pemfile.read(), None, unsafe_skip_rsa_key_validation=True
141141
),
142142
mode="rb",
143143
)
144144
cert = load_vectors_from_file(
145-
os.path.join("pkcs7", "ca.pem"),
145+
os.path.join("x509", "custom", "ca", "ca.pem"),
146146
loader=lambda pemfile: x509.load_pem_x509_certificate(pemfile.read()),
147147
mode="rb",
148148
)
@@ -266,7 +266,7 @@ def verify_invalid_pkcs7_certificate(certificate: x509.Certificate):
266266
verifier.verify(certificate, [])
267267

268268
@pytest.mark.parametrize(
269-
"filename", ["ca_non_ascii_san.pem", "ca_ascii_san.pem"]
269+
"filename", ["non-ascii-san.pem", "ascii-san.pem"]
270270
)
271271
def test_verify_pkcs7_certificate_wrong_san(self, filename):
272272
# Read a certificate with an invalid SAN

vectors/cryptography_vectors/pkcs7/ca.pem

Lines changed: 0 additions & 11 deletions
This file was deleted.

vectors/cryptography_vectors/pkcs7/ca_ascii_san.pem

Lines changed: 0 additions & 23 deletions
This file was deleted.

vectors/cryptography_vectors/pkcs7/ca_key.pem

Lines changed: 0 additions & 5 deletions
This file was deleted.

vectors/cryptography_vectors/pkcs7/ca_non_ascii_san.pem

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)