Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TKSS-1037: KonaSSLTlcpHandshakePerfTest adds cases on GCM cipher suites #1041

Merged
merged 1 commit into from
Jan 10, 2025
Merged

TKSS-1037: KonaSSLTlcpHandshakePerfTest adds cases on GCM cipher suites #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kona-crypto/src/main/java/com/tencent/kona/crypto/KonaCryptoNativeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2024, THL A29 Limited, a Tencent company. All rights reserved.
* Copyright (C) 2024, 2025, THL A29 Limited, a Tencent company. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -86,9 +86,9 @@ private static void putSMEntries(Provider provider) {
"com.tencent.kona.crypto.provider.nativeImpl.SM2KeyPairGenerator");
provider.put("Cipher.SM2", "com.tencent.kona.crypto.provider.nativeImpl.SM2Cipher");
provider.put("Signature.SM2", "com.tencent.kona.crypto.provider.nativeImpl.SM2Signature");
provider.put("KeyFactory.SM2", "com.tencent.kona.crypto.provider.SM2KeyFactory");
provider.put("Alg.Alias.Signature.SM3withSM2", "SM2");
provider.put("KeyAgreement.SM2", "com.tencent.kona.crypto.provider.nativeImpl.SM2KeyAgreement");
provider.put("KeyFactory.SM2", "com.tencent.kona.crypto.provider.SM2KeyFactory");
}

public static KonaCryptoNativeProvider instance() {
Expand Down
4 changes: 2 additions & 2 deletions kona-crypto/src/main/java/com/tencent/kona/crypto/KonaCryptoProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022, 2024, THL A29 Limited, a Tencent company. All rights reserved.
* Copyright (C) 2022, 2025, THL A29 Limited, a Tencent company. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -88,9 +88,9 @@ private static void putSMEntries(Provider provider) {
"com.tencent.kona.crypto.provider.SM2KeyPairGenerator");
provider.put("Cipher.SM2", "com.tencent.kona.crypto.provider.SM2Cipher");
provider.put("Signature.SM2", "com.tencent.kona.crypto.provider.SM2Signature");
provider.put("KeyFactory.SM2", "com.tencent.kona.crypto.provider.SM2KeyFactory");
provider.put("Alg.Alias.Signature.SM3withSM2", "SM2");
provider.put("KeyAgreement.SM2", "com.tencent.kona.crypto.provider.SM2KeyAgreement");
provider.put("KeyFactory.SM2", "com.tencent.kona.crypto.provider.SM2KeyFactory");
}

static void putSMPBES2Entries(Provider provider) {
Expand Down
3 changes: 2 additions & 1 deletion kona-ssl/src/jmh/java/com/tencent/kona/ssl/perf/KonaSSLTlcpHandshakePerfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ public class KonaSSLTlcpHandshakePerfTest {
@Param({"TLCPv1.1"})
String protocol;

@Param({"TLCP_ECC_SM4_CBC_SM3", "TLCP_ECDHE_SM4_CBC_SM3"})
@Param({"TLCP_ECC_SM4_CBC_SM3", "TLCP_ECDHE_SM4_CBC_SM3",
"TLCP_ECC_SM4_GCM_SM3", "TLCP_ECDHE_SM4_GCM_SM3"})
String cipherSuite;

@Param({"false", "true"})
Expand Down
Loading