TKSS-966: kona_jni.h is not included

Tencent · Dec 5, 2024 · b62fa17 · b62fa17
1 parent 50dbf16
commit b62fa17
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/kona-crypto/src/main/jni/kona_sm2_cipher.c b/kona-crypto/src/main/jni/kona_sm2_cipher.c
@@ -27,6 +27,7 @@
 #include <openssl/ec.h>
 #include <openssl/evp.h>
 
+#include "kona/kona_jni.h"
 #include "kona/kona_common.h"
 #include "kona/kona_sm2.h"
 

diff --git a/kona-crypto/src/main/jni/kona_sm2_common.c b/kona-crypto/src/main/jni/kona_sm2_common.c
@@ -28,6 +28,7 @@
 #include <openssl/evp.h>
 
 #include "kona/kona_common.h"
+#include "kona/kona_sm2.h"
 
 EVP_PKEY* load_pub_key(const uint8_t* pub_key, size_t pub_key_len) {
     EVP_PKEY_CTX* key_ctx = EVP_PKEY_CTX_new_from_name(NULL, "SM2", NULL);

diff --git a/kona-crypto/src/main/jni/kona_sm2_keypair.c b/kona-crypto/src/main/jni/kona_sm2_keypair.c
@@ -27,6 +27,7 @@
 #include <openssl/ec.h>
 #include <openssl/evp.h>
 
+#include "kona/kona_jni.h"
 #include "kona/kona_common.h"
 #include "kona/kona_sm2.h"
 

diff --git a/kona-crypto/src/main/jni/kona_sm2_signature.c b/kona-crypto/src/main/jni/kona_sm2_signature.c
@@ -27,6 +27,7 @@
 #include <openssl/ec.h>
 #include <openssl/evp.h>
 
+#include "kona/kona_jni.h"
 #include "kona/kona_common.h"
 #include "kona/kona_sm2.h"
 

diff --git a/kona-crypto/src/main/jni/kona_sm3.c b/kona-crypto/src/main/jni/kona_sm3.c
@@ -24,9 +24,9 @@
 
 #include <openssl/evp.h>
 
+#include "kona/kona_jni.h"
 #include "kona/kona_common.h"
 
-/* ***** SM3 start ***** */
 int sm3_reset(EVP_MD_CTX* ctx) {
     if (ctx == NULL) {
         return OPENSSL_FAILURE;
@@ -178,9 +178,7 @@ JNIEXPORT jlong JNICALL Java_com_tencent_kona_crypto_provider_nativeImpl_NativeC
 
     return (jlong)new_ctx;
 }
-/* ***** SM3 end ***** */
 
-/* ***** SM3HMAC start ***** */
 int sm3hmac_reset(EVP_MAC_CTX* ctx) {
     if (!EVP_MAC_init(ctx, NULL, 0, NULL)) {
         OPENSSL_print_err();
@@ -341,4 +339,3 @@ JNIEXPORT jlong JNICALL Java_com_tencent_kona_crypto_provider_nativeImpl_NativeC
 
     return (jlong)new_ctx;
 }
-/* ***** SM3HMAC end ***** */
diff --git a/kona-crypto/src/main/jni/kona_sm4.c b/kona-crypto/src/main/jni/kona_sm4.c
@@ -24,9 +24,9 @@
 
 #include <openssl/evp.h>
 
+#include "kona/kona_jni.h"
 #include "kona/kona_common.h"
 
-/* ***** SM4 start ***** */
 JNIEXPORT jlong JNICALL Java_com_tencent_kona_crypto_provider_nativeImpl_NativeCrypto_sm4CreateCtx
   (JNIEnv* env, jobject thisObj, jboolean encrypt, jstring mode, jboolean padding, jbyteArray key, jbyteArray iv) {
     if (key == NULL) {
@@ -230,4 +230,3 @@ JNIEXPORT jint JNICALL Java_com_tencent_kona_crypto_provider_nativeImpl_NativeCr
 
     return result;
 }
-/* ***** SM4 end ***** */
diff --git a/kona-crypto/src/main/resources/libKonaCrypto-linux-aarch64.so b/kona-crypto/src/main/resources/libKonaCrypto-linux-aarch64.so
diff --git a/kona-crypto/src/main/resources/libKonaCrypto-linux-x86_64.so b/kona-crypto/src/main/resources/libKonaCrypto-linux-x86_64.so