diff --git a/CMakeLists.txt b/CMakeLists.txt index 138129c9..cc9ebbb6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -820,7 +820,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.2.0-dev.1088") +set(CPACK_PACKAGE_VERSION "3.2.0-dev.1089") set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_NSIS_MODIFY_PATH ON) include(CPack) diff --git a/include/gmssl/version.h b/include/gmssl/version.h index 648b47ba..d58d8496 100644 --- a/include/gmssl/version.h +++ b/include/gmssl/version.h @@ -18,7 +18,7 @@ extern "C" { #define GMSSL_VERSION_NUM 30200 -#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1088" +#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1089" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/include/gmssl/x509_cer.h b/include/gmssl/x509_cer.h index af864b9d..75c64032 100644 --- a/include/gmssl/x509_cer.h +++ b/include/gmssl/x509_cer.h @@ -324,6 +324,7 @@ typedef enum { } X509_CERT_TYPE; int x509_cert_check(const uint8_t *cert, size_t certlen, int cert_type, int *path_len_constraint); +int x509_cert_check_subject(const uint8_t *cert, size_t certlen, int is_cacert); /* IssuerAndSerialNumber ::= SEQUENCE { @@ -363,6 +364,8 @@ typedef enum { } X509_CERT_CHAIN_TYPE; #define X509_MAX_VERIFY_DEPTH 6 +//int x509_cert_chain_verify(const uint8_t *certs, size_t certslen, +// const uint8_t *cacerts, size_t cacertslen, int depth, int *verify_result); int x509_certs_verify(const uint8_t *certs, size_t certslen, int certs_type, const uint8_t *rootcerts, size_t rootcertslen, int depth, int *verify_result); int x509_certs_verify_tlcp(const uint8_t *certs, size_t certslen, int certs_type, diff --git a/src/sm4_cl.c b/src/sm4_cl.c index 05ade0fb..743eeabd 100644 --- a/src/sm4_cl.c +++ b/src/sm4_cl.c @@ -182,6 +182,7 @@ static int sm4_cl_set_key(SM4_CL_CTX *ctx, const uint8_t key[16], int enc) cl_error_print(err); + // FIXME: sizeof(log) 错误? if ((err = clGetProgramBuildInfo(ctx->program, device, CL_PROGRAM_BUILD_LOG, sizeof(log), NULL, &loglen)) != CL_SUCCESS) { cl_error_print(err); goto end;