From 6dd75dd54e9d6167f1726a838641f832b5f7f533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20K=C3=A1cha?= <ph@cesnet.cz>
Date: Wed, 4 May 2022 17:05:21 +0200
Subject: [PATCH] More py3 string/bytes fixes
---
warden_ra/warden_ra.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/warden_ra/warden_ra.py b/warden_ra/warden_ra.py
index 99fa15e..f8fecbe 100755
--- a/warden_ra/warden_ra.py
+++ b/warden_ra/warden_ra.py
@@ -368,7 +368,7 @@ class CertHandler(ObjectBase):
if not password:
raise self.req.error(message="Missing password and certificate validation failed", error=403, name=name, password=password)
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:
raise self.req.error(message="Processing error", error=403, exc=sys.exc_info())
self.log.info("Generated.")
@@ -512,7 +512,7 @@ def request(registry, key, csr, verbose=False):
"prompt=no\n"
"\n"
"[req_distinguished_name]\n"
- "commonName=dummy"
+ "commonName=dummy".encode("ascii")
)
openssl.stdin.close()
openssl.wait()
@@ -532,7 +532,7 @@ def gen_cert(registry, name, csr, cert, password, verbose=False):
print(newcert.as_pem())
with open(cert, "w") as f:
f.write(newcert.as_text())
- f.write(newcert.as_pem())
+ f.write(newcert.as_pem().decode("ascii"))
def get_args():
--
GitLab