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.

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-874: Upgrade OpenSSL to version 3.3.2 #875

Merged
merged 1 commit into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion kona-crypto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ For providing the above features, `KonaCrypto` implements the JDK-specified Serv

## Implementations

Tencent Kona Crypto provides pure Java-based SM2, SM3 and SM4, and also JNI and OpenSSL-based SM3 and SM4 (SM2 implementation is on the way). The latter supports Linux x86_64/aarch64 platforms. OpenSSL version 3.3.1 is used by default, but versions 3.0 and later can be supported.
Tencent Kona Crypto provides pure Java-based SM2, SM3 and SM4, and also JNI and OpenSSL-based SM3 and SM4 (SM2 implementation is on the way). The latter supports Linux x86_64/aarch64 platforms. OpenSSL version 3.3.2 is used by default, but versions 3.0 and later can be supported.

The pure Java-based implementations is enabled. The java system property `com.tencent.kona.useNativeCrypto` can be used to enable the OpenSSL-based implementation. The additional system property `com.tencent.kona.openssl.crypto.lib.path` is used to specify an alternative local OpenSSL crypto lib file (`libcrypto.so`). The value of this property is a local absolute path.

Expand Down
2 changes: 1 addition & 1 deletion kona-crypto/README_cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

## 实现方式

目前既提供了纯Java语言实现的SM2,SM3和SM4算法,也提供了基于JNI与OpenSSL实现的SM3和SM4算法(未来也将实现SM2)。后者仅支持Linux x86_64/aarch64平台。本项目默认使用的OpenSSL版本为3.3.1,但可以支持3.0及之后的版本。
目前既提供了纯Java语言实现的SM2,SM3和SM4算法,也提供了基于JNI与OpenSSL实现的SM3和SM4算法(未来也将实现SM2)。后者仅支持Linux x86_64/aarch64平台。本项目默认使用的OpenSSL版本为3.3.2,但可以支持3.0及之后的版本。

默认地,启用纯Java的实现。若要启用基于OpenSSL的实现,需要设置系统属性`com.tencent.kona.useNativeCrypto`的值为`true`。另外,还提供了系统属性`com.tencent.kona.openssl.crypto.lib.path`以指定使用本地的其他OpenSSL crypto库文件(`libcrypto.so`),该系统属性的值是一个本地绝对路径。

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import static com.tencent.kona.crypto.CryptoUtils.*;

/**
* The internal APIs for underlying native crypto library from OpenSSL 3.3.1.
* The internal APIs for underlying native crypto library from OpenSSL 3.3.2.
*/
final class NativeCrypto {

Expand Down
Binary file modified kona-crypto/src/main/resources/libOpenSSLCrypto-linux-aarch64.so
Binary file not shown.
Binary file modified kona-crypto/src/main/resources/libOpenSSLCrypto-linux-x86_64.so
Binary file not shown.