Update v0.1.68

george012 · Apr 10, 2024 · 08dc438 · 08dc438
1 parent 1f03355
commit 08dc438
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -5,7 +5,7 @@ package config
 
 const (
 	ProjectName        = "gtbox"
-	ProjectVersion     = "v0.1.67"
+	ProjectVersion     = "v0.1.68"
 	ProjectDescription = "[Golang]日常开发工具箱"
 )
 

diff --git a/gtbox_encryption/gtbox_encryption.go b/gtbox_encryption/gtbox_encryption.go
@@ -6,9 +6,18 @@ package gtbox_encryption
 /*
 #cgo CFLAGS: -I../libs/gtgo
 #cgo LDFLAGS: -L../libs/gtgo -lgtgo
-#include "gtgo.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h> // 添加这一行
+extern int GT_encryptionStr(const char *inputStr,char *outputStr,const char *keyString);
+extern int GT_decryptionStr(const char *inputStr, char *outputStr, const char *keyString);
+extern int gt_dec(const char *inputStr, char **outputStr, const char *keyString);
+extern int gt_enc(const char *inputStr, char **outputStr, const char *keyString);
+extern const char* GT_getVerison();
 extern int fatal_enc(const char *inputStr, char **outputStr, char *keyString);
 extern int fatal_dec(const char *inputStr, char **outputStr, char *keyString);
+extern char* GT_MD5(char *inputStr);
 */
 import "C"
 

diff --git a/libs/gtgo/android/arm64-v8a/libgtgo.so b/libs/gtgo/android/arm64-v8a/libgtgo.so
diff --git a/libs/gtgo/android/armeabi-v7a/libgtgo.so b/libs/gtgo/android/armeabi-v7a/libgtgo.so
diff --git a/libs/gtgo/android/include/gtgo.h b/libs/gtgo/android/include/gtgo.h
@@ -18,7 +18,7 @@ extern "C"
 
     void scrypt_1024_1_1_256(const char* input, char* output);
     void scrypt_1024_1_1_256_sp(const char* input, char* output, char* scratchpad);
-    const int scrypt_scratchpad_size = 131583;
+    const int scrypt_scratchpad_size;
 #ifdef __cplusplus // 如果是 C++ 编译环境
 } // 结束 extern "C" 块
 #endif

diff --git a/libs/gtgo/android/x86/libgtgo.so b/libs/gtgo/android/x86/libgtgo.so
diff --git a/libs/gtgo/android/x86_64/libgtgo.so b/libs/gtgo/android/x86_64/libgtgo.so
diff --git a/libs/gtgo/gtgo.dll b/libs/gtgo/gtgo.dll
diff --git a/libs/gtgo/gtgo.h b/libs/gtgo/gtgo.h
@@ -18,7 +18,7 @@ extern "C"
 
     void scrypt_1024_1_1_256(const char* input, char* output);
     void scrypt_1024_1_1_256_sp(const char* input, char* output, char* scratchpad);
-    const int scrypt_scratchpad_size = 131583;
+    const int scrypt_scratchpad_size;
 #ifdef __cplusplus // 如果是 C++ 编译环境
 } // 结束 extern "C" 块
 #endif

diff --git a/libs/gtgo/libgtgo.dylib b/libs/gtgo/libgtgo.dylib
diff --git a/libs/gtgo/libgtgo.so b/libs/gtgo/libgtgo.so
diff --git a/ltc_scrypt/ltc_scrypt.go b/ltc_scrypt/ltc_scrypt.go
@@ -3,7 +3,13 @@ package ltc_scrypt
 /*
 #cgo CFLAGS: -I../libs/gtgo
 #cgo LDFLAGS: -L../libs/gtgo -lgtgo
-#include "gtgo.h"
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h> // 添加这一行
+extern void scrypt_1024_1_1_256(const char* input, char* output);
+extern void scrypt_1024_1_1_256_sp(const char* input, char* output, char* scratchpad);
+extern const int scrypt_scratchpad_size;
 */
 import "C"
 import (