abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-07 08:56:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix sign_to_der functions

Browse Source
This commit is contained in:
Zhi Guan
2023-02-06 17:27:19 +08:00
parent 60c8b0b397
commit 895dbeee5b
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/x509_cer.c
View File

@@ -1016,7 +1016,6 @@ int x509_cert_sign_to_der(
{
size_t len = 0;
uint8_t *tbs;
size_t tbslen;
int sig_alg = OID_sm2sign_with_sm3;
uint8_t sig[SM2_MAX_SIGNATURE_SIZE];
size_t siglen = SM2_signature_typical_size;
@@ -1039,7 +1038,9 @@ int x509_cert_sign_to_der(
error_print();
return -1;
}
tbs = *out;
if (out && *out) {
tbs = *out;
}
if (x509_tbs_cert_to_der(
version,
@@ -1056,12 +1057,11 @@ int x509_cert_sign_to_der(
error_print();
return -1;
}
tbslen = *out - tbs;
if (out && *out) {
SM2_SIGN_CTX sign_ctx;
if (sm2_sign_init(&sign_ctx, sign_key, signer_id, signer_id_len) != 1
|| sm2_sign_update(&sign_ctx, tbs, tbslen) != 1
|| sm2_sign_update(&sign_ctx, tbs, *out - tbs) != 1
|| sm2_sign_finish_fixlen(&sign_ctx, siglen, sig) != 1) {
gmssl_secure_clear(&sign_ctx, sizeof(sign_ctx));
error_print();

9
src/x509_crl.c
View File

@@ -1427,7 +1427,6 @@ int x509_crl_sign_to_der(
{
size_t len = 0;
uint8_t *tbs;
size_t tbslen;
uint8_t sig[SM2_MAX_SIGNATURE_SIZE];
size_t siglen = SM2_signature_typical_size;
@@ -1445,19 +1444,19 @@ int x509_crl_sign_to_der(
error_print();
return -1;
}
tbs = *out;
if (out && *out) {
tbs = *out;
}
if (x509_tbs_crl_to_der(version, sig_alg, issuer, issuer_len,
this_update, next_update, revoked_certs, revoked_certs_len,
crl_exts, crl_exts_len, out, outlen) != 1) {
error_print();
return -1;
}
tbslen = *out - tbs;
if (out && *out) {
SM2_SIGN_CTX sign_ctx;
if (sm2_sign_init(&sign_ctx, sign_key, signer_id, signer_id_len) != 1
|| sm2_sign_update(&sign_ctx, tbs, tbslen) != 1
|| sm2_sign_update(&sign_ctx, tbs, *out - tbs) != 1
|| sm2_sign_finish_fixlen(&sign_ctx, siglen, sig) != 1) {
gmssl_secure_clear(&sign_ctx, sizeof(sign_ctx));
error_print();

8
src/x509_req.c
View File

@@ -169,7 +169,6 @@ int x509_req_sign_to_der(
{
size_t len = 0;
uint8_t *tbs;
size_t tbslen;
int sig_alg = OID_sm2sign_with_sm3;
uint8_t sig[SM2_MAX_SIGNATURE_SIZE];
size_t siglen = SM2_signature_typical_size;
@@ -182,17 +181,18 @@ int x509_req_sign_to_der(
error_print();
return -1;
}
tbs = *out;
if (out && *out) {
tbs = *out;
}
if (x509_request_info_to_der(version, subject, subject_len, subject_public_key,
attrs, attrs_len, out, outlen) != 1) {
error_print();
return -1;
}
tbslen = *out - tbs;
if (out && *out) {
SM2_SIGN_CTX sign_ctx;
if (sm2_sign_init(&sign_ctx, sign_key, signer_id, signer_id_len) != 1
|| sm2_sign_update(&sign_ctx, tbs, tbslen) != 1
|| sm2_sign_update(&sign_ctx, tbs, *out - tbs) != 1
|| sm2_sign_finish_fixlen(&sign_ctx, siglen, sig) != 1) {
gmssl_secure_clear(&sign_ctx, sizeof(sign_ctx));
error_print();