From 1532472dcbd34c59092074e12b9b66234feae67c Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Sat, 22 Jun 2024 12:42:24 -0700
Subject: [PATCH] salt.crypt.private_encrypt is no longer needed

The class moethod salt.crypt.PrivateKey.encrypt replaces
salt.crypt.private_encrypt
---
 salt/channel/server.py |  6 ++----
 salt/crypt.py          | 14 +-------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/salt/channel/server.py b/salt/channel/server.py
index d54fafbf827..d5f6638ca5e 100644
--- a/salt/channel/server.py
+++ b/salt/channel/server.py
@@ -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)
diff --git a/salt/crypt.py b/salt/crypt.py
index 1589a10e15d..d0a8d232a9f 100644
--- a/salt/crypt.py
+++ b/salt/crypt.py
@@ -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):
         """