Skip to content
Snippets Groups Projects
Commit 6dd75dd5 authored by Pavel Kácha's avatar Pavel Kácha
Browse files

More py3 string/bytes fixes

parent 7992ee0f
No related branches found
No related tags found
No related merge requests found
...@@ -368,7 +368,7 @@ class CertHandler(ObjectBase): ...@@ -368,7 +368,7 @@ class CertHandler(ObjectBase):
if not password: if not password:
raise self.req.error(message="Missing password and certificate validation failed", error=403, name=name, password=password) raise self.req.error(message="Missing password and certificate validation failed", error=403, name=name, password=password)
try: try:
newcert = self.registry.new_cert(client, csr_data, password[0]) newcert = self.registry.new_cert(client, csr_data.decode('latin1'), password[0])
except Exception as e: except Exception as e:
raise self.req.error(message="Processing error", error=403, exc=sys.exc_info()) raise self.req.error(message="Processing error", error=403, exc=sys.exc_info())
self.log.info("Generated.") self.log.info("Generated.")
...@@ -512,7 +512,7 @@ def request(registry, key, csr, verbose=False): ...@@ -512,7 +512,7 @@ def request(registry, key, csr, verbose=False):
"prompt=no\n" "prompt=no\n"
"\n" "\n"
"[req_distinguished_name]\n" "[req_distinguished_name]\n"
"commonName=dummy" "commonName=dummy".encode("ascii")
) )
openssl.stdin.close() openssl.stdin.close()
openssl.wait() openssl.wait()
...@@ -532,7 +532,7 @@ def gen_cert(registry, name, csr, cert, password, verbose=False): ...@@ -532,7 +532,7 @@ def gen_cert(registry, name, csr, cert, password, verbose=False):
print(newcert.as_pem()) print(newcert.as_pem())
with open(cert, "w") as f: with open(cert, "w") as f:
f.write(newcert.as_text()) f.write(newcert.as_text())
f.write(newcert.as_pem()) f.write(newcert.as_pem().decode("ascii"))
def get_args(): def get_args():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment