beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

when generating a CSR in the control panel, don't set empty attributes

Browse source 
Same as in a52c56e571.

Fixes #1338.
This commit is contained in:
Joshua Tauberer 2018-01-28 08:41:31 -05:00
parent ec3aab0eaa
commit ef6f121491
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -1,6 +1,13 @@
CHANGELOG CHANGELOG
========= =========
In Development
--------------
Control Panel:
* Installing your own TLS/SSL certificate had been broken since v0.24 because the new version of openssl became stricter about CSR generation parameters.
v0.26b (January 25, 2018) v0.26b (January 25, 2018)
------------------------- -------------------------

2
management/ssl_certificates.py
View file

@ -556,7 +556,7 @@ def create_csr(domain, ssl_key, country_code, env):
"openssl", "req", "-new", "openssl", "req", "-new",
"-key", ssl_key, "-key", ssl_key,
"-sha256", "-sha256",
"-subj", "/C=%s/ST=/L=/O=/CN=%s" % (country_code, domain)]) "-subj", "/C=%s/CN=%s" % (country_code, domain)])
def install_cert(domain, ssl_cert, ssl_chain, env, raw=False): def install_cert(domain, ssl_cert, ssl_chain, env, raw=False):
# Write the combined cert+chain to a temporary path and validate that it is OK. # Write the combined cert+chain to a temporary path and validate that it is OK.