Add X509_KEY to support different public key algos

This commit is contained in:
Zhi Guan
2026-01-16 17:25:17 +08:00
parent d7f93bf379
commit 47639a9e23
37 changed files with 1539 additions and 364 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2022 The GmSSL Project. All Rights Reserved.
* Copyright 2014-2026 The GmSSL Project. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the License); you may
* not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
static int test_x509_version(void)
{
// X509v1 cert has no version, so version in X509v2, X509v3 is explicit
// version = -1 means do not encode version (for X509v1)
int tests[] = {
X509_version_v1,
X509_version_v2,
@@ -33,14 +35,16 @@ static int test_x509_version(void)
size_t len = 0;
int i;
format_print(stderr, 0, 0, "Version\n");
format_print(stderr, 0, 4, "EXPLICIT Version(s) to DER\n");
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
if (x509_explicit_version_to_der(i, tests[i], &p, &len) < 0) {
error_print();
return -1;
}
format_bytes(stderr, 0, 4, "", buf, len);
format_bytes(stderr, 0, 8, "", buf, len);
}
format_print(stderr, 0, 4, "EXPLICIT Version from DER\n");
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
int ver;
if (x509_explicit_version_from_der(i, &ver, &cp, &len) < 0
@@ -48,11 +52,12 @@ static int test_x509_version(void)
error_print();
return -1;
}
format_print(stderr, 0, 4, "%s\n", x509_version_name(ver));
format_print(stderr, 0, 8, "%s\n", x509_version_name(ver));
}
(void)asn1_length_is_zero(len);
printf("%s() ok\n", __FUNCTION__);
return 0;
return 1;
}
@@ -60,6 +65,9 @@ static int test_x509_validity(void)
{
time_t not_before, not_before_;
time_t not_after, not_after_;
time_t now;
int days = 365;
int max_secs = 60 * 60 * 24 * days;
uint8_t buf[256];
uint8_t *p = buf;
const uint8_t *cp = buf;
@@ -67,22 +75,43 @@ static int test_x509_validity(void)
time(&not_before);
format_print(stderr, 0, 0, "Validity\n");
if (x509_validity_add_days(&not_after, not_before, 365) != 1
if (x509_validity_add_days(&not_after, not_before, days) != 1
|| x509_validity_to_der(not_before, not_after, &p, &len) != 1) {
error_print();
return -1;
}
format_bytes(stderr, 0, 4, "", buf, len);
format_bytes(stderr, 0, 4, "Validity (DER)", buf, len);
if (x509_validity_from_der(&not_before_, &not_after_, &cp, &len) != 1
|| asn1_check(not_before == not_before_) != 1
|| asn1_check(not_after == not_after_) != 1
|| asn1_length_is_zero(len) != 1) {
error_print();
return 1;
return -1;
}
time(&now);
if (x509_validity_check(not_before, not_after, now, max_secs) != 1) {
error_print();
return -1;
}
// x509_validity_print need the V(Value) of Validity TLV
{
const uint8_t *d;
size_t dlen;
cp = buf;
len = sizeof(buf);
if (asn1_sequence_from_der(&d, &dlen, &cp, &len) != 1) {
error_print();
return -1;
}
x509_validity_print(stderr, 0, 4, "Validity", d, dlen);
}
printf("%s() ok\n", __FUNCTION__);
return 0;
return 1;
}
static int test_x509_attr_type_and_value(void)
@@ -96,7 +125,7 @@ static int test_x509_attr_type_and_value(void)
const uint8_t *cp = buf;
size_t len = 0;
format_print(stderr, 0, 0, "AttributeTypeAndValue\n");
format_print(stderr, 0, 4, "AttributeTypeAndValue\n");
if (x509_attr_type_and_value_to_der(OID_at_locality_name, ASN1_TAG_PrintableString, (uint8_t *)"Haidian", strlen("Haidian"), &p, &len) != 1) {
error_print();
return -1;
@@ -113,8 +142,9 @@ static int test_x509_attr_type_and_value(void)
}
format_print(stderr, 0, 4, "%s : %s ", x509_name_type_name(oid), asn1_tag_name(tag));
format_string(stderr, 0, 0, "", d, dlen);
printf("%s() ok\n", __FUNCTION__);
return 0;
return 1;
}
static int test_x509_rdn(void)
@@ -130,7 +160,7 @@ static int test_x509_rdn(void)
const uint8_t *cp = buf;
size_t len = 0;
format_print(stderr, 0, 0, "RDN\n");
format_print(stderr, 0, 4, "RDN\n");
if (x509_rdn_to_der(OID_at_locality_name, ASN1_TAG_PrintableString,
(uint8_t *)"Haidian", strlen("Haidian"), NULL, 0, &p, &len) != 1) {
error_print();
@@ -150,13 +180,13 @@ static int test_x509_rdn(void)
}
format_print(stderr, 0, 4, "%s : %s ", x509_name_type_name(oid), asn1_tag_name(tag));
format_string(stderr, 0, 0, "", d, dlen);
printf("%s() ok\n", __FUNCTION__);
return 0;
return 1;
}
static int test_x509_name(void)
{
int err = 0;
uint8_t name[512];
size_t namelen = 0;
uint8_t buf[1024];
@@ -178,18 +208,21 @@ static int test_x509_name(void)
|| format_bytes(stderr, 0, 4, "", name, namelen) > 2
) {
error_print();
return 1;
return -1;
}
format_bytes(stdout, 0, 0, "der ", name, namelen);
x509_name_print(stdout, 0, 0, "Name", name, namelen);
return 0;
format_bytes(stdout, 0, 4, "der ", name, namelen);
x509_name_print(stdout, 0, 4, "Name", name, namelen);
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_x509_public_key_info(void)
{
int err = 0;
SM2_KEY sm2_key;
SM2_KEY pub_key;
int algor = OID_ec_public_key;
int algor_param = OID_sm2;
X509_KEY x509_key;
X509_KEY pub_key;
uint8_t buf[256];
const uint8_t *cp = buf;
uint8_t *p = buf;
@@ -197,26 +230,32 @@ static int test_x509_public_key_info(void)
const uint8_t *d;
size_t dlen;
if (sm2_key_generate(&sm2_key) != 1
|| x509_public_key_info_to_der(&sm2_key, &p, &len) != 1
if (x509_key_generate(&x509_key, algor, algor_param) != 1) {
error_print();
return -1;
}
if (x509_public_key_info_to_der(&x509_key, &p, &len) != 1
|| asn1_sequence_from_der(&d, &dlen, &cp, &len) != 1
|| asn1_length_is_zero(len) != 1) {
error_print();
return 1;
return -1;
}
x509_public_key_info_print(stdout, 0, 0, "PublicKeyInfo", d, dlen);
if (sm2_key_generate(&sm2_key) != 1
|| x509_public_key_info_to_der(&sm2_key, &p, &len) != 1
x509_public_key_info_print(stdout, 0, 4, "PublicKeyInfo", d, dlen);
if (x509_key_generate(&x509_key, algor, algor_param) != 1) {
error_print();
return -1;
}
if (x509_public_key_info_to_der(&x509_key, &p, &len) != 1
|| x509_public_key_info_from_der(&pub_key, &cp, &len) != 1
|| asn1_length_is_zero(len) != 1) {
error_print();
return 1;
return -1;
}
sm2_public_key_print(stdout, 0, 8, "ECPublicKey", &pub_key);
x509_public_key_print(stdout, 0, 4, "ECPublicKey", &pub_key);
printf("%s() ok\n", __FUNCTION__);
return 0;
return 1;
}
static int set_x509_name(uint8_t *name, size_t *namelen, size_t maxlen)
@@ -236,13 +275,15 @@ static int set_x509_name(uint8_t *name, size_t *namelen, size_t maxlen)
static int test_x509_tbs_cert(void)
{
int algor = OID_ec_public_key;
int algor_param = OID_sm2;
uint8_t serial[20] = { 0x01, 0x00 };
uint8_t issuer[256];
size_t issuer_len = 0;
time_t not_before, not_after;
uint8_t subject[256];
size_t subject_len = 0;
SM2_KEY sm2_key;
X509_KEY x509_key;
uint8_t buf[1024] = {0};
uint8_t *p = buf;
const uint8_t *cp = buf;
@@ -254,7 +295,11 @@ static int test_x509_tbs_cert(void)
time(&not_before);
x509_validity_add_days(&not_after, not_before, 365);
set_x509_name(subject, &subject_len, sizeof(subject));
sm2_key_generate(&sm2_key);
if (x509_key_generate(&x509_key, algor, algor_param) != 1) {
error_print();
return -1;
}
if (x509_tbs_cert_to_der(
X509_version_v3,
@@ -263,7 +308,7 @@ static int test_x509_tbs_cert(void)
issuer, issuer_len,
not_before, not_after,
subject, subject_len,
&sm2_key,
&x509_key,
NULL, 0,
NULL, 0,
NULL, 0,
@@ -271,7 +316,7 @@ static int test_x509_tbs_cert(void)
error_print();
return -1;
}
format_bytes(stderr, 0, 0, "tbs_cert", buf, len);
format_bytes(stderr, 0, 4, "tbs_cert", buf, len);
if (asn1_sequence_from_der(&d, &dlen, &cp, &len) != 1
|| asn1_length_is_zero(len) != 1) {
error_print();
@@ -279,7 +324,8 @@ static int test_x509_tbs_cert(void)
}
x509_tbs_cert_print(stderr, 0, 4, "TBSCertificate", d, dlen);
return 0;
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_x509_cert_get(const uint8_t *cert, size_t certlen)
@@ -290,7 +336,7 @@ static int test_x509_cert_get(const uint8_t *cert, size_t certlen)
size_t issuer_len;
const uint8_t *subject;
size_t subject_len;
SM2_KEY public_key;
X509_KEY public_key;
if (x509_cert_get_issuer_and_serial_number(cert, certlen, &issuer, &issuer_len, &serial, &serial_len) != 1
|| x509_cert_get_subject(cert, certlen, &subject, &subject_len) != 1
@@ -301,19 +347,23 @@ static int test_x509_cert_get(const uint8_t *cert, size_t certlen)
format_bytes(stderr, 0, 4, "SerialNumber", serial, serial_len);
x509_name_print(stderr, 0, 4, "Issuer", issuer, issuer_len);
x509_name_print(stderr, 0, 4, "Subject", subject, subject_len);
sm2_public_key_print(stderr, 0, 4, "SubjectPublicKey", &public_key);
return 0;
x509_public_key_print(stderr, 0, 4, "SubjectPublicKey", &public_key);
printf("%s() ok\n", __FUNCTION__);
return 1;
}
static int test_x509_cert(void)
{
int algor = OID_ec_public_key;
int algor_param = OID_sm2;
uint8_t serial[20] = { 0x01, 0x00 };
uint8_t issuer[256];
size_t issuer_len = 0;
time_t not_before, not_after;
uint8_t subject[256];
size_t subject_len = 0;
SM2_KEY sm2_key;
X509_KEY x509_key;
uint8_t cert[1024] = {0};
uint8_t *p = cert;
const uint8_t *cp = cert;
@@ -323,7 +373,11 @@ static int test_x509_cert(void)
time(&not_before);
x509_validity_add_days(&not_after, not_before, 365);
set_x509_name(subject, &subject_len, sizeof(subject));
sm2_key_generate(&sm2_key);
if (x509_key_generate(&x509_key, algor, algor_param) != 1) {
error_print();
return -1;
}
if (x509_cert_sign_to_der(
X509_version_v3,
@@ -332,11 +386,11 @@ static int test_x509_cert(void)
issuer, issuer_len,
not_before, not_after,
subject, subject_len,
&sm2_key,
&x509_key,
NULL, 0,
NULL, 0,
NULL, 0,
&sm2_key, SM2_DEFAULT_ID, strlen(SM2_DEFAULT_ID),
&x509_key, SM2_DEFAULT_ID, strlen(SM2_DEFAULT_ID),
&p, &certlen) != 1) {
error_print();
return -1;
@@ -380,19 +434,27 @@ static int test_x509_cert(void)
}
x509_cert_print(stderr, 0, 4, "Certificate", cert, certlen);
return 0;
printf("%s() ok\n", __FUNCTION__);
return 1;
}
int main(void)
{
int err = 0;
err += test_x509_version();
err += test_x509_validity();
err += test_x509_attr_type_and_value();
err += test_x509_rdn();
err += test_x509_name();
err += test_x509_public_key_info();
err += test_x509_tbs_cert();
err += test_x509_cert();
return err;
if (test_x509_version() != 1) goto err;
if (test_x509_validity() != 1) goto err;
if (test_x509_attr_type_and_value() != 1) goto err;
if (test_x509_rdn() != 1) goto err;
if (test_x509_name() != 1) goto err;
if (test_x509_public_key_info() != 1) {
error_print();
goto err;
}
if (test_x509_tbs_cert() != 1) goto err;
if (test_x509_cert() != 1) goto err;
printf("%s all tests passed\n", __FILE__);
return 0;
err:
error_print();
return 1;
}