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

Merge pull request #264 from kevgliss/246 

Closes #246
This commit is contained in:
kevgliss 2016-04-01 09:51:10 -07:00
parent dfaf45344c 576265e09c
commit d0ec925ca3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/certificates/service.py
View File

@ -144,7 +144,7 @@ def mint(issuer_options):
if not issuer_options.get('csr'): if not issuer_options.get('csr'):
csr, private_key = create_csr(issuer_options) csr, private_key = create_csr(issuer_options)
else: else:
csr = issuer_options.get('csr') csr = str(issuer_options.get('csr'))
private_key = None private_key = None
issuer_options['creator'] = g.user.email issuer_options['creator'] = g.user.email

2
lemur/certificates/views.py
View File

@ -232,7 +232,7 @@ class CertificatesList(AuthenticatedResource):
"owner": "bob@example.com", "owner": "bob@example.com",
"description": "test", "description": "test",
"selectedAuthority": "timetest2", "selectedAuthority": "timetest2",
"csr", "csr": "----BEGIN CERTIFICATE REQUEST-----...",
"authority": { "authority": {
"body": "-----BEGIN...", "body": "-----BEGIN...",
"name": "timetest2", "name": "timetest2",