x/cloudbase-init
Code Issues Proposed changes

Remove newlines from PEM header and footer constants

Browse Source
This commit is contained in:
Alessandro Pilotti 2013-12-17 02:31:39 +02:00
parent b5030fa9d8
commit 01a2e823c4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cloudbaseinit/plugins/windows/x509.py
View File

@ -34,6 +34,8 @@ STORE_NAME_MY = "My"
STORE_NAME_ROOT = "Root" STORE_NAME_ROOT = "Root"
STORE_NAME_TRUSTED_PEOPLE = "TrustedPeople" STORE_NAME_TRUSTED_PEOPLE = "TrustedPeople"
PEM_HEADER = "-----BEGIN CERTIFICATE-----"
PEM_FOOTER = "-----END CERTIFICATE-----"
class CryptoAPICertManager(object): class CryptoAPICertManager(object):
def _get_cert_thumprint(self, cert_context_p): def _get_cert_thumprint(self, cert_context_p):
@ -200,15 +202,12 @@ class CryptoAPICertManager(object):
free(subject_encoded) free(subject_encoded)
def _get_cert_base64(self, cert_data): def _get_cert_base64(self, cert_data):
header = "-----BEGIN CERTIFICATE-----\n"
footer = "-----END CERTIFICATE-----\n"
base64_cert_data = cert_data base64_cert_data = cert_data
if base64_cert_data.startswith(header): if base64_cert_data.startswith(PEM_HEADER):
base64_cert_data = base64_cert_data[len(header):] base64_cert_data = base64_cert_data[len(PEM_HEADER):]
if base64_cert_data.endswith(footer): if base64_cert_data.endswith(PEM_FOOTER):
base64_cert_data = base64_cert_data[:len(base64_cert_data) - base64_cert_data = base64_cert_data[:len(base64_cert_data) -
len(footer)] len(PEM_FOOTER)]
return base64_cert_data.replace("\n", "") return base64_cert_data.replace("\n", "")
def import_cert(self, cert_data, machine_keyset=True, def import_cert(self, cert_data, machine_keyset=True,