external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

allow for PEM private keys in the 'BEGIN PRIVATE KEY' format too 

see https://discourse.mailinabox.email/t/another-upgrade-failure/630/5
This commit is contained in:
Joshua Tauberer 2015-07-02 15:34:16 -04:00
parent 6302aa6c12
commit 0924f8ca7a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/status_checks.py
View File

@ -760,7 +760,7 @@ def load_pem(pem):
from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.backends import default_backend
pem_type = re.match(b"-+BEGIN (.*?)-+\n", pem).group(1)
if pem_type == b"RSA PRIVATE KEY":
if pem_type in (b"RSA PRIVATE KEY", b"PRIVATE KEY"):
return serialization.load_pem_private_key(pem, password=None, backend=default_backend())
if pem_type == b"CERTIFICATE":
return load_pem_x509_certificate(pem, default_backend())