From 60bba82a622473ca96a89bb8d3ecfad86267b939 Mon Sep 17 00:00:00 2001
From: John Jiang <johnsjiang@tencent.com>
Date: Tue, 10 Dec 2024 14:55:10 +0800
Subject: [PATCH] TKSS-979: TLCP session resumption performance regression with
 OpenSSL

---
 .../com/tencent/kona/crypto/CryptoInsts.java  | 60 +++++++++++++++----
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/kona-crypto/src/main/java/com/tencent/kona/crypto/CryptoInsts.java b/kona-crypto/src/main/java/com/tencent/kona/crypto/CryptoInsts.java
index 3383b7cb..cb3420a3 100644
--- a/kona-crypto/src/main/java/com/tencent/kona/crypto/CryptoInsts.java
+++ b/kona-crypto/src/main/java/com/tencent/kona/crypto/CryptoInsts.java
@@ -82,39 +82,49 @@ public static KeyGenerator getKeyGenerator(String algorithm)
     private static final Set<String> KEY_PAIR_GEN_ALGOS
             = new HashSet<>(Arrays.asList("SM2"));
 
-    public static KeyPairGenerator getKeyPairGenerator(String algorithm)
+    public static KeyPairGenerator getKeyPairGenerator(String algorithm, Provider prov)
             throws NoSuchAlgorithmException {
         KeyPairGenerator keyPairGenerator  = null;
         if (KEY_PAIR_GEN_ALGOS.contains(algorithm)) {
-            keyPairGenerator = KeyPairGenerator.getInstance(algorithm, PROV);
+            keyPairGenerator = KeyPairGenerator.getInstance(algorithm, prov);
         } else {
             keyPairGenerator = KeyPairGenerator.getInstance(algorithm);
         }
         return keyPairGenerator;
     }
 
+    public static KeyPairGenerator getKeyPairGenerator(String algorithm)
+            throws NoSuchAlgorithmException {
+        return getKeyPairGenerator(algorithm, PROV);
+    }
+
     private static final Set<String> CIPHER_ALGOS
             = new HashSet<>(Arrays.asList("SM2", "SM4"));
 
-    public static Cipher getCipher(String algorithm)
+    public static Cipher getCipher(String algorithm, Provider prov)
             throws NoSuchPaddingException, NoSuchAlgorithmException {
         Cipher cipher  = null;
         if (CIPHER_ALGOS.contains(algorithm)) {
-            cipher = Cipher.getInstance(algorithm, PROV);
+            cipher = Cipher.getInstance(algorithm, prov);
         } else {
             cipher = Cipher.getInstance(algorithm);
         }
         return cipher;
     }
 
+    public static Cipher getCipher(String algorithm)
+            throws NoSuchPaddingException, NoSuchAlgorithmException {
+        return getCipher(algorithm, PROV);
+    }
+
     private static final Set<String> MESSAGE_DIGEST_ALGOS
             = new HashSet<>(Collections.singletonList("SM3"));
 
-    public static MessageDigest getMessageDigest(String algorithm)
+    public static MessageDigest getMessageDigest(String algorithm, Provider prov)
             throws NoSuchAlgorithmException {
         MessageDigest messageDigest  = null;
         if (MESSAGE_DIGEST_ALGOS.contains(algorithm)) {
-            messageDigest = MessageDigest.getInstance(algorithm, PROV);
+            messageDigest = MessageDigest.getInstance(algorithm, prov);
         } else {
             messageDigest = MessageDigest.getInstance(algorithm);
         }
@@ -122,19 +132,33 @@ public static MessageDigest getMessageDigest(String algorithm)
         return messageDigest;
     }
 
+    public static MessageDigest getMessageDigest(String algorithm)
+            throws NoSuchAlgorithmException {
+        return getMessageDigest(algorithm,
+                // use pure Java-based SM3 for TLCP/TLS protocol
+                KonaCryptoProvider.instance());
+    }
+
     private static final Set<String> MAC_ALGOS
             = new HashSet<>(Arrays.asList("HmacSM3", "SM3HMac"));
 
-    public static Mac getMac(String algorithm) throws NoSuchAlgorithmException {
+    public static Mac getMac(String algorithm, Provider prov)
+            throws NoSuchAlgorithmException {
         Mac mac  = null;
         if (MAC_ALGOS.contains(algorithm)) {
-            mac = Mac.getInstance(algorithm, PROV);
+            mac = Mac.getInstance(algorithm, prov);
         } else {
-             mac = Mac.getInstance(algorithm);
+            mac = Mac.getInstance(algorithm);
         }
         return mac;
     }
 
+    public static Mac getMac(String algorithm) throws NoSuchAlgorithmException {
+        return getMac(algorithm,
+                // use pure Java-based SM3HMac for TLCP/TLS protocol
+                KonaCryptoProvider.instance());
+    }
+
     private static final Set<String> SIGNATURE_ALGOS
             = new HashSet<>(Arrays.asList(
                     "SM2", "SM3withSM2",
@@ -142,28 +166,38 @@ public static Mac getMac(String algorithm) throws NoSuchAlgorithmException {
                     "SHA224withECDSA", "SHA256withECDSA",
                     "SHA384withECDSA", "SHA512withECDSA"));
 
-    public static Signature getSignature(String algorithm)
+    public static Signature getSignature(String algorithm, Provider prov)
             throws NoSuchAlgorithmException {
         Signature signature  = null;
         if (SIGNATURE_ALGOS.contains(algorithm)) {
-            signature = Signature.getInstance(algorithm, PROV);
+            signature = Signature.getInstance(algorithm, prov);
         } else {
             signature = Signature.getInstance(algorithm);
         }
         return signature;
     }
 
+    public static Signature getSignature(String algorithm)
+            throws NoSuchAlgorithmException {
+        return getSignature(algorithm, PROV);
+    }
+
     private static final Set<String> KEY_AGREEMENT_ALGOS
             = new HashSet<>(Arrays.asList("SM2", "ECDH"));
 
-    public static KeyAgreement getKeyAgreement(String algorithm)
+    public static KeyAgreement getKeyAgreement(String algorithm, Provider prov)
             throws NoSuchAlgorithmException {
         KeyAgreement keyAgreement  = null;
         if (KEY_AGREEMENT_ALGOS.contains(algorithm)) {
-            keyAgreement = KeyAgreement.getInstance(algorithm, PROV);
+            keyAgreement = KeyAgreement.getInstance(algorithm, prov);
         } else {
             keyAgreement = KeyAgreement.getInstance(algorithm);
         }
         return keyAgreement;
     }
+
+    public static KeyAgreement getKeyAgreement(String algorithm)
+            throws NoSuchAlgorithmException {
+        return getKeyAgreement(algorithm, PROV);
+    }
 }