Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #302 from kevgliss/301-p12-no-chain 

Closes #301
This commit is contained in:
kevgliss 2016-05-04 17:07:42 -07:00
parent f919b7360e db8243b4b4
commit 941d36ebfe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lemur/plugins/lemur_openssl/plugin.py
View File

@ -33,11 +33,12 @@ def run_process(command):
raise Exception(stderr) raise Exception(stderr)
def create_pkcs12(cert, p12_tmp, key, alias, passphrase): def create_pkcs12(cert, chain, p12_tmp, key, alias, passphrase):
""" """
Creates a pkcs12 formated file. Creates a pkcs12 formated file.
:param cert: :param cert:
:param jks_tmp: :param chain:
:param p12_tmp:
:param key: :param key:
:param alias: :param alias:
:param passphrase: :param passphrase:
@ -49,7 +50,7 @@ def create_pkcs12(cert, p12_tmp, key, alias, passphrase):
# Create PKCS12 keystore from private key and public certificate # Create PKCS12 keystore from private key and public certificate
with mktempfile() as cert_tmp: with mktempfile() as cert_tmp:
with open(cert_tmp, 'w') as f: with open(cert_tmp, 'w') as f:
f.write(cert) f.writelines([cert + "\n", chain + "\n"])
run_process([ run_process([
"openssl", "openssl",
@ -119,7 +120,7 @@ class OpenSSLExportPlugin(ExportPlugin):
with mktemppath() as output_tmp: with mktemppath() as output_tmp:
if type == 'PKCS12 (.p12)': if type == 'PKCS12 (.p12)':
create_pkcs12(body, output_tmp, key, alias, passphrase) create_pkcs12(body, chain, output_tmp, key, alias, passphrase)
extension = "p12" extension = "p12"
else: else:
raise Exception("Unable to export, unsupported type: {0}".format(type)) raise Exception("Unable to export, unsupported type: {0}".format(type))