oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix OpenSSL cert generation using LibreSSL

Browse source
This commit is contained in:
shortcutme 2019-10-24 03:09:16 +02:00
parent 0531d47721
commit 448bb3ce98
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Crypt/CryptConnection.py
View file

@ -18,8 +18,11 @@ class CryptConnectionManager:
else: else:
self.openssl_bin = "openssl" self.openssl_bin = "openssl"
self.openssl_conf_template = "src/lib/openssl/openssl.cnf"
self.openssl_conf = config.data_dir + "/openssl.cnf"
self.openssl_env = { self.openssl_env = {
"OPENSSL_CONF": "src/lib/openssl/openssl.cnf", "OPENSSL_CONF": self.openssl_conf,
"RANDFILE": config.data_dir + "/openssl-rand.tmp" "RANDFILE": config.data_dir + "/openssl-rand.tmp"
} }
@ -124,10 +127,15 @@ class CryptConnectionManager:
import subprocess import subprocess
# Replace variables in config template
conf_template = open(self.openssl_conf_template).read()
conf_template = conf_template.replace("$ENV::CN", self.openssl_env['CN'])
open(self.openssl_conf, "w").write(conf_template)
# Generate CAcert and CAkey # Generate CAcert and CAkey
cmd_params = helper.shellquote( cmd_params = helper.shellquote(
self.openssl_bin, self.openssl_bin,
self.openssl_env["OPENSSL_CONF"], self.openssl_conf,
random.choice(casubjects), random.choice(casubjects),
self.cakey_pem, self.cakey_pem,
self.cacert_pem self.cacert_pem
@ -154,7 +162,7 @@ class CryptConnectionManager:
self.key_pem, self.key_pem,
self.cert_csr, self.cert_csr,
"/CN=" + self.openssl_env['CN'], "/CN=" + self.openssl_env['CN'],
self.openssl_env["OPENSSL_CONF"], self.openssl_conf,
) )
cmd = "%s req -new -newkey rsa:2048 -keyout %s -out %s -subj %s -sha256 -nodes -batch -config %s" % cmd_params cmd = "%s req -new -newkey rsa:2048 -keyout %s -out %s -subj %s -sha256 -nodes -batch -config %s" % cmd_params
self.log.debug("Generating certificate key and signing request...") self.log.debug("Generating certificate key and signing request...")
@ -173,7 +181,7 @@ class CryptConnectionManager:
self.cacert_pem, self.cacert_pem,
self.cakey_pem, self.cakey_pem,
self.cert_pem, self.cert_pem,
self.openssl_env["OPENSSL_CONF"] self.openssl_conf
) )
cmd = "%s x509 -req -in %s -CA %s -CAkey %s -set_serial 01 -out %s -days 730 -sha256 -extensions x509_ext -extfile %s" % cmd_params cmd = "%s x509 -req -in %s -CA %s -CAkey %s -set_serial 01 -out %s -days 730 -sha256 -extensions x509_ext -extfile %s" % cmd_params
self.log.debug("Generating RSA cert...") self.log.debug("Generating RSA cert...")