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

Update TLS 1.3

Browse Source
This commit is contained in:
Zhi Guan
2026-04-13 11:34:16 +08:00
parent 2e550edc35
commit 0bcffd3734
5 changed files with 708 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
include/gmssl/tls.h
View File

@@ -746,34 +746,10 @@ typedef struct {
int protocol;
// 客户端和服务器端协商出公共的cipher_suite
int cipher_suites[TLS_MAX_CIPHER_SUITES_COUNT];
size_t cipher_suites_cnt;
int key_exchange_modes;
// 服务器端需要根据客户端提供的SNI来选择证书链
// 客户端需要根据服务器提供的CA以及算法限定来选择证书链，因此双方都需要准备多个证书链
// 在TLS 1.3中，证书链是 CertificateEntry certificate_list
// 这意味着其中每个证书都可能有附带的扩展，
/*
status_request 这个信息主要是最近的OCSP的信息，表明证书的状态
signed_certificate_timestamp 这个信息是长期的，CT的信息，一般是不变的
因此客户端在提供证书的时候，实际上可以将这个信息直接附在上面
我们在保存的时候也应该保存完整的certificate_list，而不是单独的信息
也许我们需要一个信息来标注里面存储的格式
*/
// 允许设定多个证书链，每个证书链对应一个x509_key，或者一个附加的enc_key
int cipher_suites[TLS_MAX_CIPHER_SUITES_COUNT];
size_t cipher_suites_cnt;
uint8_t cert_chains[8192];
size_t cert_chains_len;
@@ -942,7 +918,7 @@ typedef struct {
uint8_t databuf[TLS_MAX_RECORD_SIZE]; // 需要替换为plain_record
uint8_t *data;
uint8_t *data; // 让data指向plain_record
size_t datalen;
@@ -1073,13 +1049,15 @@ typedef struct {
// 41. pre_shared_key
int pre_shared_key;
const DIGEST *psk_digests[8];
size_t psk_digests_cnt;
uint8_t psk_identities[512];
size_t psk_identities_len;
int psk_cipher_suites[8];
size_t psk_cipher_suites_cnt;
uint8_t psk_keys[32 * 8];
size_t psk_keys_len;
const uint8_t *psk_identity;
size_t psk_identity_len;
uint8_t psk[32]; // 这应该改为一个指针
@@ -1381,11 +1359,15 @@ int tls13_enable_pre_shared_key(TLS_CONNECT *conn, int enable);
int tls13_enable_early_data(TLS_CONNECT *conn, int enable);
int tls13_add_pre_shared_key(TLS_CONNECT *conn, const DIGEST *digest, const uint8_t *identity, size_t identitylen,
const uint8_t *pre_shared_key, size_t pre_shared_key_len, uint32_t tls13_add_pre_shared_key);
int tls13_add_pre_shared_key(TLS_CONNECT *conn, const uint8_t *identity, size_t identitylen,
const uint8_t *pre_shared_key, size_t pre_shared_key_len,
int cipher_suite,
uint32_t age);
int tls13_add_pre_shared_key_from_file(TLS_CONNECT *conn, const char *file);
int tls13_set_psk_key_exchange_modes(TLS_CONNECT *conn, int psk_ke, int psk_dhe_ke);
int tls13_ctx_set_psk_key_exchange_modes(TLS_CTX *ctx, int psk_ke, int psk_dhe_ke);
int tls13_verify_psk_binder(const DIGEST *digest,
@@ -1471,6 +1453,7 @@ int tls_signed_certificate_timestamp_print(FILE *fp, int fmt, int ind,
int ocsp_response_verify(const uint8_t *ocsp_response, size_t ocsp_response_len,
const uint8_t *ca_certs, size_t ca_certs_len);
int tls13_cipher_suite_get(int cipher_suite, const BLOCK_CIPHER **cipher, const DIGEST **digest);
#ifdef __cplusplus
}

3
src/tls.c
View File

@@ -2242,9 +2242,6 @@ int tls_ctx_init(TLS_CTX *ctx, int protocol, int is_client)
ctx->supported_versions_cnt = sizeof(supported_versions)/sizeof(supported_versions[0]);
// key_exchange_modes
ctx->key_exchange_modes = TLS_KE_CERT_DHE;
ctx->verify_depth = 5;

843
src/tls13.c
View File

File diff suppressed because it is too large Load Diff

160
tools/tls13_client.c
View File

@@ -27,23 +27,24 @@ static const char *options = "-host str [-port num] [-cacert file] [-cert file -
static const char *help =
"Options\n"
"\n"
" -host str Server's hostname\n"
" -port num Server's port number, default 443\n"
" -cipher_suite str Supported cipher suites, may appear multiple times, higher priority first\n"
" -supported_group str Supported elliptic curves, may appear multiple times, higher priority first\n"
" -sig_alg str Supported signature algorithms\n"
" -max_key_exchanges num Number of key exchanges in key_share extension\n"
" -cacert file Root CA certificate\n"
" -cert file Client's certificate chain in PEM format\n"
" -key file Client's encrypted private key in PEM format\n"
" -pass str Password to decrypt private key\n"
" -psk_ke Support PSK-only key exchange\n"
" -psk_dhe_ke Support PSK with (EC)DHE key exchange\n"
" -psk_identity str Identity of pre_shared_key\n"
" -psk hex Pre-shared key in HEX format\n"
" -sess_in Load server's session ticket file\n"
" -sess_out Save server's session ticket file\n"
" -early_data file Send early data, -psk_ke and/or -psk_dhe_ke should be set\n"
" -host str Server's hostname\n"
" -port num Server's port number, default 443\n"
" -cipher_suite str Supported cipher suites, may appear multiple times, higher priority first\n"
" -supported_group str Supported elliptic curves, may appear multiple times, higher priority first\n"
" -sig_alg str Supported signature algorithms\n"
" -max_key_exchanges num Number of key exchanges in key_share extension\n"
" -cacert file Root CA certificate\n"
" -cert file Client's certificate chain in PEM format\n"
" -key file Client's encrypted private key in PEM format\n"
" -pass str Password to decrypt private key\n"
" -psk_ke Support PSK-only key exchange\n"
" -psk_dhe_ke Support PSK with (EC)DHE key exchange\n"
" -psk_identity str PSK Identity\n"
" -psk_cipher_suite str PSK cipher suite\n"
" -psk_key hex PSK key in HEX format, of PSK hash length\n"
" -sess_in Load server's session ticket file\n"
" -sess_out Save server's session ticket file\n"
" -early_data file Send early data, -psk_ke and/or -psk_dhe_ke should be set\n"
"\n"
"CipherSuites\n"
" TLS_SM4_GCM_SM3 TLS 1.3\n"
@@ -101,10 +102,18 @@ int tls13_client_main(int argc, char *argv[])
char *sess_in = NULL;
char *sess_out = NULL;
char *psk_identity = NULL;
char *psk = NULL;
uint8_t psk_buf[32];
size_t psk_len;
int psk_ke = 0;
int psk_dhe_ke = 0;
// psk external
char *psk_identities[16];
size_t psk_identities_cnt = 0;
char *psk_cipher_suites[16];
size_t psk_cipher_suites_cnt = 0;
char *psk_keys[16];
size_t psk_keys_cnt = 0;
char *early_data_file = NULL;
FILE *early_data_fp = NULL;
@@ -129,8 +138,6 @@ int tls13_client_main(int argc, char *argv[])
size_t sig_algs_cnt = 0;
int psk_ke = 0;
int psk_dhe_ke = 0;
argc--;
@@ -168,16 +175,32 @@ int tls13_client_main(int argc, char *argv[])
} else if (!strcmp(*argv, "-sess_out")) {
if (--argc < 1) goto bad;
sess_out = *(++argv);
} else if (!strcmp(*argv, "-psk_identity")) {
if (--argc < 1) goto bad;
psk_identity = *(++argv);
} else if (!strcmp(*argv, "-psk")) {
if (--argc < 1) goto bad;
psk = *(++argv);
} else if (!strcmp(*argv, "-psk_ke")) {
psk_ke = 1;
} else if (!strcmp(*argv, "-psk_dhe_ke")) {
psk_dhe_ke = 1;
} else if (!strcmp(*argv, "-psk_identity")) {
if (--argc < 1) goto bad;
if (psk_identities_cnt > sizeof(psk_identities)/sizeof(psk_identities[0])) {
error_print();
return -1;
}
psk_identities[psk_identities_cnt++] = *(++argv);
} else if (!strcmp(*argv, "-psk_cipher_suite")) {
if (--argc < 1) goto bad;
if (psk_cipher_suites_cnt > sizeof(psk_cipher_suites)/sizeof(psk_cipher_suites[0])) {
error_print();
return -1;
}
psk_cipher_suites[psk_cipher_suites_cnt++] = *(++argv);
} else if (!strcmp(*argv, "-psk_key")) {
if (--argc < 1) goto bad;
if (psk_keys_cnt > sizeof(psk_keys)/sizeof(psk_keys[0])) {
error_print();
return -1;
}
psk_keys[psk_keys_cnt++] = *(++argv);
} else if (!strcmp(*argv, "-early_data")) {
if (--argc < 1) goto bad;
early_data_file = *(++argv);
@@ -323,6 +346,24 @@ bad:
goto end;
}
}
if (psk_ke || psk_dhe_ke) {
if (!sess_in && !psk_keys_cnt) {
fprintf(stderr, "%s: -sess_in or -psk is required\n", prog);
error_print();
return -1;
}
tls13_ctx_set_psk_key_exchange_modes(&ctx, psk_ke, psk_dhe_ke);
}
if (tls_init(&conn, &ctx) != 1) {
fprintf(stderr, "%s: error\n", prog);
goto end;
@@ -344,44 +385,47 @@ bad:
}
}
if (psk_ke || psk_dhe_ke) {
if (!sess_in && !psk) {
fprintf(stderr, "%s: -sess_in or -psk is required\n", prog);
if (psk_keys_cnt) {
const uint32_t obfuscated_ticket_age = 0;
size_t i;
if (psk_identities_cnt != psk_keys_cnt || psk_cipher_suites_cnt != psk_keys_cnt) {
error_print();
return -1;
}
tls13_set_psk_key_exchange_modes(&conn, psk_ke, psk_dhe_ke);
for (i = 0; i < psk_keys_cnt; i++) {
int psk_cipher_suite;
const BLOCK_CIPHER *psk_cipher;
const DIGEST *psk_digest;
uint8_t psk_key[64];
size_t psk_key_len;
fprintf(stderr, "conn->psk_key_exchange_modes: %d\n", conn.key_exchange_modes);
}
if (psk) {
if (!psk_identity) {
fprintf(stderr, "%s: -psk_identity is required for every -psk\n", prog);
error_print();
return -1;
}
if (strlen(psk) != sizeof(psk_buf) * 2) {
error_print();
return -1;
}
if (hex_to_bytes(psk, strlen(psk), psk_buf, &psk_len) != 1) {
error_print();
return -1;
}
// support multiple pairs
if (tls13_add_pre_shared_key(&conn, DIGEST_sm3(), (uint8_t *)psk_identity, strlen(psk_identity), psk_buf, psk_len, 0) != 1) {
error_print();
return -1;
if (!(psk_cipher_suite = tls_cipher_suite_from_name(psk_cipher_suites[i]))) {
error_print();
return -1;
}
if (tls13_cipher_suite_get(psk_cipher_suite, &psk_cipher, &psk_digest) != 1) {
error_print();
return -1;
}
if (strlen(psk_keys[i]) != psk_digest->digest_size * 2) {
error_print();
return -1;
}
if (hex_to_bytes(psk_keys[i], strlen(psk_keys[i]), psk_key, &psk_key_len) != 1) {
error_print();
return -1;
}
if (tls13_add_pre_shared_key(&conn, (uint8_t *)psk_identities[i], strlen(psk_identities[i]),
psk_key, psk_key_len, psk_cipher_suite, obfuscated_ticket_age) != 1) {
error_print();
return -1;
}
}
tls13_enable_pre_shared_key(&conn, 1);
}
if (early_data_file) {
uint8_t early_data[8192];
size_t early_data_len;

171
tools/tls13_server.c
View File

@@ -36,8 +36,9 @@ static const char *help =
" -ticket_key hex Session ticket encrypt/decrypt key in HEX format\n"
" -psk_ke Support PSK-only key exchange\n"
" -psk_dhe_ke Support PSK with (EC)DHE key exchange\n"
" -psk_identity str Identity of pre_shared_key\n"
" -psk hex Pre-shared key in HEX format\n"
" -psk_identity str PSK Identity\n"
" -psk_cipher_suite str PSK cipher suite\n"
" -psk_key hex PSK key in HEX format, of PSK hash length\n"
" -early_data Accept EarlyData, support 0-RTT\n"
" -max_early_data_size num Set extension max_early_data_size\n"
"\n"
@@ -78,6 +79,20 @@ static const char *help =
"\n"
" sudo gmssl tls13_server -port 4430 -cert certs.pem -key signkey.pem -pass 1234\n"
" gmssl tls13_client -host 127.0.0.1 -port 4430 -cacert rootcacert.pem\n"
"\n"
" sudo gmssl tls13_server -port 4430 -cert certs.pem -key signkey.pem -pass 1234 \n"
" -cipher_suite TLS_SM4_GCM_SM3 -cipher_suite TLS_AES_128_GCM_SHA256 \n"
" -supported_group sm2p256v1 -supported_group prime256v1\n"
" -sig_alg sm2sig_sm3 -sig_alg ecdsa_secp256r1_sha256\n"
"\n"
" PSK=1122334455667788112233445566778811223344556677881122334455667788\n"
" sudo gmssl tls13_server -port 4430 -cipher_suite TLS_SM4_GCM_SM3 -psk_ke -psk_identity 001 -psk_cipher_suite TLS_SM4_GCM_SM3 -psk_key $PSK\n"
" gmssl tls13_cliet -host 127.0.0.1 -port 4430 -cipher_suite TLS_SM4_GCM_SM3 -psk_ke -psk_identity 001 -psk_cipher_suite TLS_SM4_GCM_SM3 -psk_key $PSK\n"
"\n"
" sudo gmssl tls13_server -port 4430 -cipher_suite TLS_SM4_GCM_SM3 -psk_ke -psk_identity 001 -psk_cipher_suite TLS_SM4_GCM_SM3 -psk_key $PSK -early_data\n"
" gmssl tls13_cliet -host 127.0.0.1 -port 4430 -cipher_suite TLS_SM4_GCM_SM3 -psk_ke -psk_identity 001 -psk_cipher_suite TLS_SM4_GCM_SM3 -psk_key $PSK -early_data early_data.txt\n"
"\n"
" sudo gmssl tls13_server -port 4430 -cipher_suite TLS_SM4_GCM_SM3 -psk_ke -psk_identity 001 -psk_cipher_suite TLS_SM4_GCM_SM3 -psk_key $PSK -new_session_ticket 2\n"
"\n";
int tls13_server_main(int argc , char **argv)
@@ -106,11 +121,15 @@ int tls13_server_main(int argc , char **argv)
int psk_ke = 0;
int psk_dhe_ke = 0;
// TODO: clean
char *psk_identity = NULL;
char *psk = NULL;
uint8_t psk_buf[32];
size_t psk_len;
// external psk
char *psk_identities[16];
size_t psk_identities_cnt = 0;
char *psk_cipher_suites[16];
size_t psk_cipher_suites_cnt = 0;
char *psk_keys[16];
size_t psk_keys_cnt = 0;
int early_data = 0;
int max_early_data_size = 0;
@@ -170,10 +189,25 @@ int tls13_server_main(int argc , char **argv)
psk_dhe_ke = 1;
} else if (!strcmp(*argv, "-psk_identity")) {
if (--argc < 1) goto bad;
psk_identity = *(++argv);
} else if (!strcmp(*argv, "-psk")) {
if (psk_identities_cnt > sizeof(psk_identities)/sizeof(psk_identities[0])) {
error_print();
return -1;
}
psk_identities[psk_identities_cnt++] = *(++argv);
} else if (!strcmp(*argv, "-psk_cipher_suite")) {
if (--argc < 1) goto bad;
psk = *(++argv);
if (psk_cipher_suites_cnt > sizeof(psk_cipher_suites)/sizeof(psk_cipher_suites[0])) {
error_print();
return -1;
}
psk_cipher_suites[psk_cipher_suites_cnt++] = *(++argv);
} else if (!strcmp(*argv, "-psk_key")) {
if (--argc < 1) goto bad;
if (psk_keys_cnt > sizeof(psk_keys)/sizeof(psk_keys[0])) {
error_print();
return -1;
}
psk_keys[psk_keys_cnt++] = *(++argv);
} else if (!strcmp(*argv, "-early_data")) {
early_data = 1;
} else if (!strcmp(*argv, "-max_early_data_size")) {
@@ -233,15 +267,10 @@ bad:
argv++;
}
/*
// 服务器的证书
if (!certfile) {
fprintf(stderr, "%s: '-cert' option required\n", prog);
return 1;
if (!cipher_suites_cnt) {
error_print();
goto end;
}
*/
if (tls_socket_lib_init() != 1) {
error_print();
@@ -256,7 +285,10 @@ bad:
return -1;
}
// 应该判断有cert的时候才载入
if (tls_ctx_set_cipher_suites(&ctx, cipher_suites, cipher_suites_cnt) != 1) {
fprintf(stderr, "%s: context init error\n", prog);
goto end;
}
if (certfile) {
if (!keyfile) {
@@ -273,15 +305,6 @@ bad:
}
}
if (!cipher_suites_cnt) {
error_print();
goto end;
}
if (tls_ctx_set_cipher_suites(&ctx, cipher_suites, cipher_suites_cnt) != 1) {
fprintf(stderr, "%s: context init error\n", prog);
goto end;
}
if (supported_groups_cnt > 0) {
if (tls_ctx_set_supported_groups(&ctx, supported_groups, supported_groups_cnt) != 1) {
error_print();
@@ -303,7 +326,13 @@ bad:
}
}
// NewSessionTicket
if (psk_ke || psk_dhe_ke) {
if (tls13_ctx_set_psk_key_exchange_modes(&ctx, psk_ke, psk_dhe_ke) != 1) {
error_print();
return -1;
}
}
if (new_session_ticket < 0) {
error_print();
return -1;
@@ -334,9 +363,21 @@ bad:
return -1;
}
tls13_enable_pre_shared_key(&conn, 1);
tls13_set_psk_key_exchange_modes(&conn, 1, 1);
}
if (early_data) {
ctx.early_data = 1;
}
if (max_early_data_size > 0) {
if (tls13_ctx_set_max_early_data_size(&ctx, max_early_data_size) != 1) {
error_print();
return -1;
}
}
if (tls_socket_create(&sock, AF_INET, SOCK_STREAM, 0) != 1) {
fprintf(stderr, "%s: socket create error\n", prog);
goto end;
@@ -368,49 +409,47 @@ restart:
return -1;
}
if (psk_ke || psk_dhe_ke) {
// 对于服务器来说只是允许进行这些模式
tls13_set_psk_key_exchange_modes(&conn, psk_ke, psk_dhe_ke);
}
if (psk_keys_cnt) {
const uint32_t obfuscated_ticket_age = 0;
size_t i;
if (psk_identities_cnt != psk_keys_cnt || psk_cipher_suites_cnt != psk_keys_cnt) {
error_print();
return -1;
}
for (i = 0; i < psk_keys_cnt; i++) {
int psk_cipher_suite;
const BLOCK_CIPHER *psk_cipher;
const DIGEST *psk_digest;
uint8_t psk_key[64];
size_t psk_key_len;
if (psk) {
if (!psk_identity) {
error_print();
return -1;
}
if (strlen(psk) != sizeof(psk_buf) * 2) {
error_print();
return -1;
}
if (hex_to_bytes(psk, strlen(psk), psk_buf, &psk_len) != 1) {
error_print();
return -1;
}
if (tls13_add_pre_shared_key(&conn, DIGEST_sm3(), (uint8_t *)psk_identity, strlen(psk_identity), psk_buf, psk_len, 0) != 1) {
error_print();
return -1;
if (!(psk_cipher_suite = tls_cipher_suite_from_name(psk_cipher_suites[i]))) {
error_print();
return -1;
}
if (tls13_cipher_suite_get(psk_cipher_suite, &psk_cipher, &psk_digest) != 1) {
error_print();
return -1;
}
if (strlen(psk_keys[i]) != psk_digest->digest_size * 2) {
error_print();
return -1;
}
if (hex_to_bytes(psk_keys[i], strlen(psk_keys[i]), psk_key, &psk_key_len) != 1) {
error_print();
return -1;
}
if (tls13_add_pre_shared_key(&conn, (uint8_t *)psk_identities[i], strlen(psk_identities[i]),
psk_key, psk_key_len, psk_cipher_suite, obfuscated_ticket_age) != 1) {
error_print();
return -1;
}
}
tls13_enable_pre_shared_key(&conn, 1);
tls13_set_psk_key_exchange_modes(&conn, 1, 1);
}
if (max_early_data_size > 0) {
if (tls13_set_max_early_data_size(&conn, max_early_data_size) != 1) {
error_print();
return -1;
}
}
if (early_data) {
if (tls13_enable_early_data(&conn, 1) != 1) {
error_print();
return -1;
}
}
if (tls_do_handshake(&conn) != 1) {
error_print();
return -1;