Fix assert_required_cryptography_version() calls.

This commit is contained in:
Felix Fontein
2025-05-03 12:55:50 +02:00
parent 83beb7148c
commit 12f958c955
20 changed files with 60 additions and 20 deletions

View File

@@ -207,7 +207,9 @@ def main():
mutually_exclusive=(["private_key_src", "private_key_content"],),
)
assert_required_cryptography_version(COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION
)
try:
# Get parameters

View File

@@ -323,7 +323,9 @@ def main():
supports_check_mode=True,
)
assert_required_cryptography_version(COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=COLLECTION_MINIMUM_CRYPTOGRAPHY_VERSION
)
# Load chain
chain = parse_PEM_list(module, module.params["input_chain"], source="input chain")

View File

@@ -994,7 +994,9 @@ def main():
supports_check_mode=True,
)
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
# If validate_only is used, pointing to an existing tracking_id is an invalid operation
if module.params["tracking_id"]:

View File

@@ -361,7 +361,9 @@ def main():
f"The Python version used to run the get_certificate module is {sys.version}"
)
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
result = dict(
changed=False,

View File

@@ -411,7 +411,9 @@ def main():
if backend == "openssl":
dhparam = DHParameterOpenSSL(module)
elif backend == "cryptography":
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
dhparam = DHParameterCryptography(module)
else:
raise AssertionError("Internal error: unknown backend")

View File

@@ -712,7 +712,9 @@ class PkcsCryptography(Pkcs):
def select_backend(module):
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
return PkcsCryptography(module)

View File

@@ -428,7 +428,9 @@ def main():
mutually_exclusive=(["privatekey_path", "privatekey_content"],),
)
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
base_dir = os.path.dirname(module.params["path"]) or "."
if not os.path.isdir(base_dir):

View File

@@ -245,7 +245,9 @@ def main():
msg=f"The file {module.params['path']} does not exist",
)
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
try:
_sign = SignatureCryptography(module)

View File

@@ -250,7 +250,9 @@ def main():
msg=f"The file {module.params['path']} does not exist",
)
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
try:
_sign = SignatureInfoCryptography(module)

View File

@@ -222,7 +222,9 @@ class X509CertificateConvertModule(OpenSSLObject):
pass
def verify_cert_parsable(self, module):
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
try:
load_der_x509_certificate(self.input)
except Exception as exc:

View File

@@ -998,7 +998,9 @@ def main():
add_file_common_args=True,
)
assert_required_cryptography_version(MINIMAL_CRYPTOGRAPHY_VERSION)
assert_required_cryptography_version(
module, minimum_cryptography_version=MINIMAL_CRYPTOGRAPHY_VERSION
)
try:
crl = CRL(module)