valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

if pubkey is the same and no signature in payload and signature checking is not enabled, we must also return the aes key

Browse Source
This commit is contained in:
Volker Schwicking 2014-07-03 21:23:12 +02:00
parent bd35eb77b9
commit 8612c34341
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/crypt.py
View File

@ -464,6 +464,9 @@ class Auth(object):
'reply does not contain any signature. Either enable signing the public ' 'reply does not contain any signature. Either enable signing the public '
'key on the master or disable signature verification on the minion.') 'key on the master or disable signature verification on the minion.')
return '' return ''
else:
aes, token = self.decrypt_aes(payload, False)
return aes
else: else:
# verify the masters pubkey signature if the minion # verify the masters pubkey signature if the minion