From d37d0b18b833959ee4b1dc46675a313d7c3ee897 Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Thu, 9 May 2024 10:22:03 +0800 Subject: [PATCH] Change SDF files --- CMakeLists.txt | 21 +--- src/sdf/Makefile | 28 ++++++ src/sdf/soft_sdf.c | 145 +++++++++++++++++++++++++--- tests/{soft_sdftest.c => sdftest.c} | 0 4 files changed, 160 insertions(+), 34 deletions(-) create mode 100644 src/sdf/Makefile rename tests/{soft_sdftest.c => sdftest.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 804b2d6a..b48a3d6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -568,17 +568,11 @@ if (ENABLE_SDF) src/sdf/sdf_meth.c src/sdf/sdf_ext.c src/sdf/sdf_sansec.c) + list(APPEND tests sdf) list(APPEND tools tools/sdfutil.c) - add_library(sdf_dummy SHARED src/sdf/sdf_dummy.c) - set_target_properties(sdf_dummy PROPERTIES VERSION 3.1 SOVERSION 3) endif() - - - - - option(ENABLE_HTTP_TESTS "Enable HTTP GET/POST related tests" OFF) if (ENABLE_HTTP_TESTS) message(STATUS "ENABLE_HTTP_TESTS") @@ -629,19 +623,6 @@ install(TARGETS gmssl ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DE install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/gmssl DESTINATION include) -option(ENABLE_SOFT_SDF "Enable Software SDF Implementation" OFF) -if (ENABLE_SOFT_SDF) - message(STATUS "ENABLE_SOFT_SDF is ON") - list(APPEND tests soft_sdf) - add_library(soft_sdf SHARED src/sdf/soft_sdf.c) - target_link_libraries(soft_sdf PRIVATE gmssl) - set_target_properties(soft_sdf PROPERTIES VERSION 3.1 SOVERSION 3) -endif() - - - - - if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS") add_executable(gmssl-bin ${tools}) target_link_libraries(gmssl-bin LINK_PUBLIC gmssl) diff --git a/src/sdf/Makefile b/src/sdf/Makefile new file mode 100644 index 00000000..77987ea6 --- /dev/null +++ b/src/sdf/Makefile @@ -0,0 +1,28 @@ + +CC=gcc +CFLAGS=-fPIC -Wall +LDFLAGS=-shared +LIBS=-lgmssl -framework Security + +TARGET=libsoft_sdf.so +OBJS=soft_sdf.o + +all: $(TARGET) + +$(OBJS): soft_sdf.c + $(CC) $(CFLAGS) -c soft_sdf.c -o $@ + +$(TARGET): $(OBJS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,-exported_symbols_list,soft_sdf.exp + +clean: + rm -f $(OBJS) $(TARGET) + +install: + cp $(TARGET) /usr/local/lib + ldconfig + +uninstall: + rm /usr/local/lib/$(TARGET) + ldconfig + diff --git a/src/sdf/soft_sdf.c b/src/sdf/soft_sdf.c index 66d7aa8d..a92c02d4 100755 --- a/src/sdf/soft_sdf.c +++ b/src/sdf/soft_sdf.c @@ -64,17 +64,128 @@ SOFTSDF_DEVICE *deviceHandle = NULL; #define FILENAME_MAX_LEN 256 -// 应该有一个初始化函数 -// 创建第一个KEK， kek-1.key，这应该就是一个明文的文件，其中是二进制的对称密钥 -// 其他的密钥是可以导入的，但是要检查不能出现重复的。 -// 也就是 +static int generate_kek(unsigned int uiKEKIndex) +{ + char filename[256]; + uint8_t kek[16]; + FILE *file; + if (rand_bytes(kek, sizeof(kek)) != 1) { + error_print(); + return -1; + } -// Create key files as a SDF device -// gmssl rand -bin -num 16 > kek-1.key -// gmssl sm2keygen -pass 123456 -out sm2sign-1.pem -pubout sm2signpub-1.pem -// gmssl sm2keygen -pass 123456 -out sm2enc-1.pem -pubout sm2encpub-1.pem + snprintf(filename, sizeof(filename), "kek-%u.key", uiKEKIndex); + if (!(file = fopen(filename, "wb"))) { + error_print(); + return -1; + } + if (fwrite(kek, 1, sizeof(kek), file) != sizeof(kek)) { + fclose(file); + error_print(); + return -1; + } + fclose(file); + return 1; +} + +static int generate_sign_key(unsigned int uiKeyIndex, const char *pass) +{ + SM2_KEY sm2_key; + char filename[256]; + FILE *file; + + if (sm2_key_generate(&sm2_key) != 1) { + error_print(); + return -1; + } + + snprintf(filename, sizeof(filename), "sm2sign-%u.pem", uiKeyIndex); + if ((file = fopen(filename, "wb")) == NULL) { + fclose(file); + error_print(); + return -1; + } + if (sm2_private_key_info_encrypt_to_pem(&sm2_key, pass, file) != 1) { + error_print(); + return -1; + } + fclose(file); + + snprintf(filename, sizeof(filename), "sm2signpub-%u.pem", uiKeyIndex); + if ((file = fopen(filename, "wb")) == NULL) { + fclose(file); + error_print(); + return -1; + } + if (sm2_public_key_info_to_pem(&sm2_key, file) != 1) { + error_print(); + return -1; + } + fclose(file); + + return 1; +} + +static int generate_enc_key(unsigned int uiKeyIndex, const char *pass) +{ + SM2_KEY sm2_key; + char filename[256]; + FILE *file; + + if (sm2_key_generate(&sm2_key) != 1) { + error_print(); + return -1; + } + + snprintf(filename, sizeof(filename), "sm2enc-%u.pem", uiKeyIndex); + if ((file = fopen(filename, "wb")) == NULL) { + fclose(file); + error_print(); + return -1; + } + if (sm2_private_key_info_encrypt_to_pem(&sm2_key, pass, file) != 1) { + error_print(); + return -1; + } + fclose(file); + + snprintf(filename, sizeof(filename), "sm2encpub-%u.pem", uiKeyIndex); + if ((file = fopen(filename, "wb")) == NULL) { + fclose(file); + error_print(); + return -1; + } + if (sm2_public_key_info_to_pem(&sm2_key, file) != 1) { + error_print(); + return -1; + } + fclose(file); + + return 1; +} + +int softSDF_CreateDevice(unsigned char *pucPassword, unsigned int uiPwdLength) +{ + if (strlen((char *)pucPassword) != uiPwdLength) { + error_print(); + return SDR_INARGERR; + } + + // generate system keypairs + generate_sign_key(0, (char *)pucPassword); + generate_enc_key(0, (char *)pucPassword); + + // generate user keypairs + generate_sign_key(1, (char *)pucPassword); + generate_enc_key(1, (char *)pucPassword); + + // generate user KEK + generate_kek(1); + + return SDR_OK; +} int SDF_OpenDevice( void **phDeviceHandle) @@ -165,7 +276,6 @@ int SDF_CloseSession( void *hSessionHandle) { SOFTSDF_SESSION *current_session; - SOFTSDF_SESSION *next_session; SOFTSDF_SESSION *prev_session; SOFTSDF_CONTAINER *current_container; SOFTSDF_CONTAINER *next_container; @@ -1581,7 +1691,6 @@ int SDF_InternalVerify_ECC( ECCSignature *pucSignature) { SOFTSDF_SESSION *session; - SOFTSDF_CONTAINER *container; char filename[FILENAME_MAX_LEN]; FILE *file = NULL; SM2_KEY sm2_key; @@ -2453,13 +2562,10 @@ int SDF_InternalEncrypt_ECC( ECCCipher *pucEncData) { SOFTSDF_SESSION *session; - SOFTSDF_CONTAINER *container; char filename[FILENAME_MAX_LEN]; FILE *file = NULL; SM2_KEY sm2_key; SM2_CIPHERTEXT ciphertext; - size_t plaintext_len; - unsigned int i; if (deviceHandle == NULL) { error_print(); @@ -2540,7 +2646,6 @@ int SDF_InternalDecrypt_ECC( SOFTSDF_CONTAINER *container; SM2_CIPHERTEXT ciphertext; size_t plaintext_len; - unsigned int i; if (deviceHandle == NULL) { error_print(); @@ -2619,3 +2724,15 @@ int SDF_InternalDecrypt_ECC( *puiDataLength = (unsigned int)plaintext_len; return SDR_OK; } + +int SDF_InternalPublicKeyOperation_RSA( + void *hSessionHandle, + unsigned int uiKeyIndex, + unsigned char *pucDataInput, + unsigned int uiInputLength, + unsigned char *pucDataOutput, + unsigned int *puiOutputLength) +{ + error_print(); + return SDR_NOTSUPPORT; +} diff --git a/tests/soft_sdftest.c b/tests/sdftest.c similarity index 100% rename from tests/soft_sdftest.c rename to tests/sdftest.c