Skip to content

Reverse 'PEM as string' checks to fix long filename error #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cs-1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reverse 'PEM as string' checks to fix long filename error #80

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions smc/administration/certificates/tls_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ def load_cert_chain(chain_file):

def certificate_content(certificate):
""" decode certificate or use it as it is """
cert_value = ''
with open(certificate, "rb") as file:
cert_value = file.read() if not pem_as_string(certificate) else certificate
cert_value = certificate
if not pem_as_string(certificate):
with open(certificate, "rb") as file:
cert_value = file.read()
return cert_value


Expand Down Expand Up @@ -203,8 +204,8 @@ def import_private_key(self, private_key):
resource="private_key_import",
headers={"content-type": "multipart/form-data"},
files={
"private_key": open(private_key, "rb")
if not pem_as_string(private_key)
else private_key
"private_key": private_key
if pem_as_string(private_key)
else open(private_key, "rb")
},
)