1
0

cleanup request signing

This commit is contained in:
ThomasV
2015-07-22 09:06:03 +02:00
parent 074872afbc
commit acbd434f76
4 changed files with 25 additions and 19 deletions

View File

@@ -348,21 +348,13 @@ def serialize_request(req):
return pr
def make_request(config, req, alias=None, alias_privkey=None):
def make_request(config, req):
pr = make_unsigned_request(req)
key_path = config.get('ssl_privkey')
cert_path = config.get('ssl_chain')
requestor = None
if key_path and cert_path:
sign_request_with_x509(pr, key_path, cert_path)
requestor = 'x'
elif alias and alias_privkey:
requestor = alias
sign_request_with_alias(pr, alias, alias_privkey)
return pr, requestor
return pr