abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-19 11:23:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update CMake

Browse Source
This commit is contained in:
Zhi Guan
2026-06-03 22:49:40 +08:00
parent f6a68cbb3f
commit 8b8ec6948c
7 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -424,6 +424,10 @@ endif()
if (ENABLE_SECP256R1) if (ENABLE_SECP256R1)
message(STATUS "ENABLE_SECP256R1 is ON") message(STATUS "ENABLE_SECP256R1 is ON")
if (NOT ENABLE_SHA2)
message(STATUS "ENABLE_SECP256R1 requires ENABLE_SHA2; enabling ENABLE_SHA2")
set(ENABLE_SHA2 ON)
endif()
add_definitions(-DENABLE_SECP256R1) add_definitions(-DENABLE_SECP256R1)
list(APPEND src src/bn.c src/secp256r1.c src/secp256r1_key.c src/ecdsa.c src/ecdh.c) list(APPEND src src/bn.c src/secp256r1.c src/secp256r1_key.c src/ecdsa.c src/ecdh.c)
list(APPEND tools tools/p256keygen.c) list(APPEND tools tools/p256keygen.c)
@@ -588,6 +592,7 @@ endif()
if (ENABLE_SM4_CBC_MAC) if (ENABLE_SM4_CBC_MAC)
message(STATUS "ENABLE_SM4_CBC_MAC is ON") message(STATUS "ENABLE_SM4_CBC_MAC is ON")
add_definitions(-DENABLE_SM4_CBC_MAC)
list(APPEND src src/sm4_cbc_mac.c) list(APPEND src src/sm4_cbc_mac.c)
list(APPEND tools tools/sm4_cbc_mac.c) list(APPEND tools tools/sm4_cbc_mac.c)
list(APPEND tests sm4_cbc_mac) list(APPEND tests sm4_cbc_mac)
@@ -610,6 +615,7 @@ endif()
if (ENABLE_SKF) if (ENABLE_SKF)
message(STATUS "ENABLE_SKF is ON") message(STATUS "ENABLE_SKF is ON")
add_definitions(-DENABLE_SKF)
list(APPEND src list(APPEND src
src/skf/skf.c src/skf/skf.c
src/skf/skf_lib.c src/skf/skf_lib.c

11
src/skf/skf.c
View File

@@ -12,6 +12,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <gmssl/skf.h> #include <gmssl/skf.h>
#include <gmssl/mem.h>
#include <gmssl/error.h> #include <gmssl/error.h>
#include "../sgd.h" #include "../sgd.h"
#include "skf.h" #include "skf.h"
@@ -62,7 +63,8 @@ static const uint8_t zeros[ECC_MAX_XCOORDINATE_BITS_LEN/8 - 32] = {0};
static int SKF_ECCPUBLICKEYBLOB_to_SM2_KEY(const ECCPUBLICKEYBLOB *blob, SM2_KEY *sm2_key) static int SKF_ECCPUBLICKEYBLOB_to_SM2_KEY(const ECCPUBLICKEYBLOB *blob, SM2_KEY *sm2_key)
{ {
SM2_POINT point; SM2_Z256_POINT point;
uint8_t buf[64];
if (blob->BitLen != 256) { if (blob->BitLen != 256) {
error_print(); error_print();
@@ -73,13 +75,14 @@ static int SKF_ECCPUBLICKEYBLOB_to_SM2_KEY(const ECCPUBLICKEYBLOB *blob, SM2_KEY
error_print(); error_print();
return -1; return -1;
} }
if (sm2_point_from_xy(&point, memcpy(buf, blob->XCoordinate + ECC_MAX_XCOORDINATE_BITS_LEN/8 - 32, 32);
blob->XCoordinate + ECC_MAX_XCOORDINATE_BITS_LEN/8 - 32, memcpy(buf + 32, blob->YCoordinate + ECC_MAX_YCOORDINATE_BITS_LEN/8 - 32, 32);
blob->YCoordinate + ECC_MAX_YCOORDINATE_BITS_LEN/8 - 32) != 1 if (sm2_z256_point_from_bytes(&point, buf) != 1
|| sm2_key_set_public_key(sm2_key, &point) != 1) { || sm2_key_set_public_key(sm2_key, &point) != 1) {
error_print(); error_print();
return -1; return -1;
} }
gmssl_secure_clear(buf, sizeof(buf));
return SAR_OK; return SAR_OK;
} }

2
tools/cmsdecrypt.c
View File

@@ -57,7 +57,7 @@ int cmsdecrypt_main(int argc, char **argv)
return 1; return 1;
} }
while (argc > 1) { while (argc > 0) {
if (!strcmp(*argv, "-help")) { if (!strcmp(*argv, "-help")) {
printf("usage: %s %s\n", prog, options); printf("usage: %s %s\n", prog, options);
ret = 0; ret = 0;

4
tools/cmsencrypt.c
View File

@@ -83,6 +83,10 @@ int cmsencrypt_main(int argc, char **argv)
fprintf(stderr, "usage: %s %s\n", prog, options); fprintf(stderr, "usage: %s %s\n", prog, options);
return 1; return 1;
} }
if (argc == 2 && !strcmp(argv[1], "-help")) {
printf("usage: %s %s\n", prog, options);
return 0;
}
// prepare cert buffer length? // prepare cert buffer length?
if (get_files_size(argc, argv, "-rcptcert", &rcpt_certs_len) != 1) { if (get_files_size(argc, argv, "-rcptcert", &rcpt_certs_len) != 1) {

2
tools/cmsparse.c
View File

@@ -37,7 +37,7 @@ int cmsparse_main(int argc, char **argv)
fprintf(stderr, "usage: %s %s\n", prog, options); fprintf(stderr, "usage: %s %s\n", prog, options);
return 1; return 1;
} }
while (argc > 1) { while (argc > 0) {
if (!strcmp(*argv, "-help")) { if (!strcmp(*argv, "-help")) {
printf("usage: %s %s\n", prog, options); printf("usage: %s %s\n", prog, options);
ret = 0; ret = 0;

2
tools/cmssign.c
View File

@@ -51,7 +51,7 @@ int cmssign_main(int argc, char **argv)
return 1; return 1;
} }
while (argc > 1) { while (argc > 0) {
if (!strcmp(*argv, "-help")) { if (!strcmp(*argv, "-help")) {
printf("usage: %s %s\n", prog, options); printf("usage: %s %s\n", prog, options);
ret = 0; ret = 0;

2
tools/cmsverify.c
View File

@@ -51,7 +51,7 @@ int cmsverify_main(int argc, char **argv)
return 1; return 1;
} }
while (argc > 1) { while (argc > 0) {
if (!strcmp(*argv, "-help")) { if (!strcmp(*argv, "-help")) {
printf("usage: %s %s\n", prog, options); printf("usage: %s %s\n", prog, options);
ret = 0; ret = 0;