saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45802 from rallytime/merge-2017.7-from-2017.7.3

Browse source 
[2017.7] Merge forward from 2017.7.3 to 2017.7
This commit is contained in:
Nicole Thomas 2018-01-31 13:55:35 -05:00 • committed by GitHub
commit c7d319f3bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/crypt.py
View file

@ -176,7 +176,7 @@ def sign_message(privkey_path, message):
key = _get_rsa_key(privkey_path)
log.debug('salt.crypt.sign_message: Signing message.')
signer = PKCS1_v1_5.new(key)
return signer.sign(SHA.new(message))
return signer.sign(SHA.new(salt.utils.to_bytes(message)))
def verify_signature(pubkey_path, message, signature):
@ -189,7 +189,7 @@ def verify_signature(pubkey_path, message, signature):
pubkey = RSA.importKey(f.read())
log.debug('salt.crypt.verify_signature: Verifying signature')
verifier = PKCS1_v1_5.new(pubkey)
return verifier.verify(SHA.new(message), signature)
return verifier.verify(SHA.new(salt.utils.to_bytes(message)), signature)
def gen_signature(priv_path, pub_path, sign_path):