mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
salt.crypt.private_encrypt is no longer needed
The class moethod salt.crypt.PrivateKey.encrypt replaces salt.crypt.private_encrypt
This commit is contained in:
parent
84a9175e2c
commit
1532472dcb
2 changed files with 3 additions and 17 deletions
|
@ -733,7 +733,7 @@ class ReqServerChannel:
|
|||
|
||||
# Be aggressive about the signature
|
||||
digest = salt.utils.stringutils.to_bytes(hashlib.sha256(aes).hexdigest())
|
||||
ret["sig"] = salt.crypt.private_encrypt(self.master_key.key, digest)
|
||||
ret["sig"] = self.master_key.key.encrypt(digest)
|
||||
eload = {"result": True, "act": "accept", "id": load["id"], "pub": load["pub"]}
|
||||
if self.opts.get("auth_events") is True:
|
||||
self.event.fire_event(eload, salt.utils.event.tagify(prefix="auth"))
|
||||
|
@ -990,9 +990,7 @@ class MasterPubServerChannel:
|
|||
)
|
||||
data["peers"][peer] = {
|
||||
"aes": pub.encrypt(aes),
|
||||
"sig": salt.crypt.private_encrypt(
|
||||
self.master_key.master_key, digest
|
||||
),
|
||||
"sig": self.master_key.master_key.encrypt(digest),
|
||||
}
|
||||
else:
|
||||
log.warning("Peer key missing %r", peer_pub)
|
||||
|
|
|
@ -426,18 +426,6 @@ def gen_signature(priv_path, pub_path, sign_path, passphrase=None):
|
|||
return True
|
||||
|
||||
|
||||
def private_encrypt(key, message):
|
||||
"""
|
||||
Generate an M2Crypto-compatible signature
|
||||
|
||||
:param Crypto.PublicKey.RSA._RSAobj key: The RSA key object
|
||||
:param str message: The message to sign
|
||||
:rtype: str
|
||||
:return: The signature, or an empty string if the signature operation failed
|
||||
"""
|
||||
return key.encrypt(message)
|
||||
|
||||
|
||||
def pwdata_decrypt(rsa_key, pwdata):
|
||||
key = serialization.load_pem_private_key(rsa_key.encode(), password=None)
|
||||
password = key.decrypt(
|
||||
|
@ -1110,7 +1098,7 @@ class AsyncAuth:
|
|||
:return: Encrypted token
|
||||
:rtype: str
|
||||
"""
|
||||
return private_encrypt(self.get_keys(), clear_tok)
|
||||
return self.get_keys().encrypt(clear_tok)
|
||||
|
||||
def minion_sign_in_payload(self):
|
||||
"""
|
||||
|
|
Loading…
Add table
Reference in a new issue