abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-27 15:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update x509_certs_verify_tlcp

Browse Source
This commit is contained in:
Zhi Guan
2026-06-18 23:18:41 +08:00
parent 09efac744e
commit c7413a0bbf
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -820,7 +820,7 @@ endif()
# #
set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_NAME "GmSSL")
set(CPACK_PACKAGE_VENDOR "GmSSL develop team") set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
set(CPACK_PACKAGE_VERSION "3.2.0-dev.1092") set(CPACK_PACKAGE_VERSION "3.2.0-dev.1093")
set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md) set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/README.md)
set(CPACK_NSIS_MODIFY_PATH ON) set(CPACK_NSIS_MODIFY_PATH ON)
include(CPack) include(CPack)

2
include/gmssl/version.h
View File

@@ -18,7 +18,7 @@ extern "C" {
#define GMSSL_VERSION_NUM 30200 #define GMSSL_VERSION_NUM 30200
#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1092" #define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1093"
int gmssl_version_num(void); int gmssl_version_num(void);
const char *gmssl_version_str(void); const char *gmssl_version_str(void);

20
src/x509_cer.c
View File

@@ -2010,8 +2010,8 @@ int x509_certs_verify_tlcp(const uint8_t *certs, size_t certslen, int certs_type
size_t kenc_certlen; size_t kenc_certlen;
const uint8_t *cacert; const uint8_t *cacert;
size_t cacertlen; size_t cacertlen;
const uint8_t *name; int matched_root = 0;
size_t namelen; int ret;
int path_len = 0; int path_len = 0;
int path_len_constraint; int path_len_constraint;
@@ -2085,15 +2085,19 @@ int x509_certs_verify_tlcp(const uint8_t *certs, size_t certslen, int certs_type
path_len++; path_len++;
} }
while (rootcertslen) {
if (x509_cert_get_issuer(cert, certlen, &name, &namelen) != 1) { if (x509_cert_from_der(&cacert, &cacertlen, &rootcerts, &rootcertslen) != 1) {
error_print(); error_print();
return -1; return -1;
} }
if (x509_certs_get_cert_by_subject(rootcerts, rootcertslen, name, namelen, &cacert, &cacertlen) != 1) { if ((ret = x509_cert_is_signed_by_root_ca_cert(cert, certlen, cacert, cacertlen,
SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH)) < 0) {
error_print(); error_print();
return -1; return -1;
} }
if (ret == 0) {
continue;
}
if (x509_cert_check(cacert, cacertlen, X509_cert_ca, &path_len_constraint) != 1) { if (x509_cert_check(cacert, cacertlen, X509_cert_ca, &path_len_constraint) != 1) {
error_print(); error_print();
return -1; return -1;
@@ -2112,9 +2116,11 @@ int x509_certs_verify_tlcp(const uint8_t *certs, size_t certslen, int certs_type
return -1; return -1;
} }
} }
matched_root = 1;
break;
}
if (x509_cert_verify_by_ca_cert(cert, certlen, cacert, cacertlen, if (!matched_root) {
SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1) {
error_print(); error_print();
return -1; return -1;
} }