internet/community.crypto
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.crypto.git synced 2026-05-07 22:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of some to_native and to_text calls. (#880)

Browse Source
This commit is contained in:
Felix Fontein
2025-05-02 15:58:39 +02:00
committed by GitHub
parent 0b8f3306c7
commit 86db561193
46 changed files with 100 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/module_utils/acme/utils.py
View File

@@ -12,7 +12,6 @@ import textwrap
import traceback
from urllib.parse import unquote
from ansible.module_utils.common.text.converters import to_native
from ansible_collections.community.crypto.plugins.module_utils.acme.errors import (
ModuleFailException,
)
@@ -51,7 +50,7 @@ def pem_to_der(pem_filename=None, pem_content=None):
lines = list(f)
except Exception as err:
raise ModuleFailException(
f"cannot load PEM file {pem_filename}: {to_native(err)}",
f"cannot load PEM file {pem_filename}: {err}",
exception=traceback.format_exc(),
)
else:
@@ -126,15 +125,17 @@ def compute_cert_id(
raise ModuleFailException(
"Certificate has no Authority Key Identifier extension"
)
aki = to_native(
base64.urlsafe_b64encode(cert_info.authority_key_identifier)
).replace("=", "")
aki = (
(base64.urlsafe_b64encode(cert_info.authority_key_identifier))
.decode("ascii")
.replace("=", "")
)
# Convert serial number to string
serial_bytes = convert_int_to_bytes(cert_info.serial_number)
if ord(serial_bytes[:1]) >= 128:
serial_bytes = b"\x00" + serial_bytes
serial = to_native(base64.urlsafe_b64encode(serial_bytes)).replace("=", "")
serial = (base64.urlsafe_b64encode(serial_bytes)).decode("ascii").replace("=", "")
# Compose cert ID
return f"{aki}.{serial}"