From b90587668c223881189014256e4686fc8c3c3f13 Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Mon, 15 Jun 2026 21:33:57 +0800 Subject: [PATCH] Clean TLCP code --- CMakeLists.txt | 2 +- include/gmssl/version.h | 2 +- src/tlcp.c | 381 +++++++++++++++++++++------------------- src/tls.c | 120 ------------- src/tls12.c | 145 +++++++++++++-- src/tls_trace.c | 6 - tools/tlcp_client.c | 2 +- tools/tlcp_help.h | 38 ++-- 8 files changed, 358 insertions(+), 338 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a691f14..d2335a93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -818,7 +818,7 @@ endif() # set(CPACK_PACKAGE_NAME "GmSSL") set(CPACK_PACKAGE_VENDOR "GmSSL develop team") -set(CPACK_PACKAGE_VERSION "3.2.0-dev.1058") +set(CPACK_PACKAGE_VERSION "3.2.0-dev.1059") 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 0c18a966..7a759b19 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.1058" +#define GMSSL_VERSION_STR "GmSSL 3.2.0-dev.1059" int gmssl_version_num(void); const char *gmssl_version_str(void); diff --git a/src/tlcp.c b/src/tlcp.c index bbca3a95..20c175fe 100644 --- a/src/tlcp.c +++ b/src/tlcp.c @@ -160,42 +160,15 @@ select (KeyExchangeAlgorithm) { } ServerKeyExchange; `signed_params` is DER signature encoded in uint16array -sm3_ctx*/ -static int tlcp_server_ecc_params_to_bytes(const uint8_t *server_enc_cert, - size_t server_enc_cert_len, uint8_t **out, size_t *outlen) -{ - if (!server_enc_cert || !server_enc_cert_len || !outlen) { - error_print(); - return -1; - } - tls_uint24array_to_bytes(server_enc_cert, server_enc_cert_len, out, outlen); - return 1; -} +*/ -static int tlcp_server_ecc_params_from_bytes(const uint8_t **server_enc_cert, - size_t *server_enc_cert_len, const uint8_t **in, size_t *inlen) -{ - if (!server_enc_cert || !server_enc_cert_len || !in || !*in || !inlen) { - error_print(); - return -1; - } - if (tls_uint24array_from_bytes(server_enc_cert, server_enc_cert_len, in, inlen) != 1) { - error_print(); - return -1; - } - if (!*server_enc_cert || !*server_enc_cert_len) { - error_print(); - return -1; - } - return 1; -} int tlcp_server_key_exchange_ecc_print(FILE *fp, const uint8_t *data, size_t datalen, int fmt, int ind) { const uint8_t *sig; size_t siglen; - format_print(fp, fmt, ind, "ServerKeyExchange\n"); + format_print(fp, fmt, ind, "ServerKeyExchange.ECC\n"); ind += 4; if (tls_uint16array_from_bytes(&sig, &siglen, &data, &datalen) != 1) { error_print(); @@ -209,6 +182,135 @@ int tlcp_server_key_exchange_ecc_print(FILE *fp, const uint8_t *data, size_t dat return 1; } +int tlcp_record_set_handshake_server_key_exchange(uint8_t *record, size_t *recordlen, + int server_key_exchange_alg, const uint8_t *server_ecdh_params, size_t server_ecdh_params_len, + const uint8_t *sig, size_t siglen) +{ + const int type = TLS_handshake_server_key_exchange; + uint8_t *p = tls_handshake_data(tls_record_data(record)); + size_t len = 0; + + if (!record || !recordlen || !sig || !siglen) { + error_print(); + return -1; + } + if (siglen > TLS_MAX_SIGNATURE_SIZE) { + error_print(); + return -1; + } + + switch (server_key_exchange_alg) { + case TLS_server_key_exchange_ecdhe: + if (!server_ecdh_params || !server_ecdh_params_len) { + error_print(); + return -1; + } + tls_array_to_bytes(server_ecdh_params, server_ecdh_params_len, &p, &len); + break; + case TLS_server_key_exchange_ecc: + if (server_ecdh_params || server_ecdh_params_len) { + error_print(); + return -1; + } + break; + default: + error_print(); + return -1; + } + + // TLCP use TLS 1.1 ServerKeyExchange, no signature_algorithm + tls_uint16array_to_bytes(sig, siglen, &p, &len); + + tls_record_set_handshake(record, recordlen, type, NULL, len); + return 1; +} + +int tlcp_record_get_handshake_server_key_exchange(const uint8_t *record, + int server_key_exchange_alg, const uint8_t **server_ecdh_params, size_t *server_ecdh_params_len, + const uint8_t **sig, size_t *siglen) +{ + int type; + const uint8_t *p; + size_t len; + + if (!record || !sig || !siglen) { + error_print(); + return -1; + } + if (tls_record_get_handshake(record, &type, &p, &len) != 1) { + error_print(); + return -1; + } + if (type != TLS_handshake_server_key_exchange) { + error_print(); + return 0; + } + + switch (server_key_exchange_alg) { + case TLS_server_key_exchange_ecdhe: + if (!server_ecdh_params || !server_ecdh_params_len) { + error_print(); + return -1; + } + *server_ecdh_params = p; + *server_ecdh_params_len = len; + { + int key_exchange_group; + const uint8_t *key_exchange; + size_t key_exchange_len; + + if (tls_server_ecdh_params_from_bytes(&key_exchange_group, + &key_exchange, &key_exchange_len, &p, &len) != 1) { + error_print(); + return -1; + } + } + *server_ecdh_params_len -= len; + break; + + case TLS_server_key_exchange_ecc: + if (server_ecdh_params || server_ecdh_params_len) { + error_print(); + return -1; + } + break; + + default: + error_print(); + return -1; + } + + if (tls_uint16array_from_bytes(sig, siglen, &p, &len) != 1 + || tls_length_is_zero(len) != 1) { + error_print(); + return -1; + } + if (!siglen) { + error_print(); + return -1; + } + return 1; +} + + +/* +struct { + select (KeyExchangeAlgorithm) { + case ECC: + opaque ECCEncryptedPreMasterSecret<0..2^16-1>; + case ECDHE: + Opaque ClientECDHEParams<1..2^16-1>; + case IBSDH: + Opaque ClientIBSDHParams<1..2^16-1>; + case IBC: + opaque IBCEncryptedPreMasterSecret<0..2^16-1>; + case RSA: + opaque RSAEncryptedPreMasterSecret<0..2^16-1>; + } exchange_keys; +} ClientKeyExchange; + +// 不管算法是什么，数据格式都是uint16array +*/ int tlcp_record_set_handshake_client_key_exchange(uint8_t *record, size_t *recordlen, const uint8_t *enced_pms, size_t enced_pms_len) { @@ -354,27 +456,6 @@ int tlcp_record_get_handshake_certificate_request(const uint8_t *record, } - -/* -ClientKeyExchange - -struct { - select (KeyExchangeAlgorithm) { - case ECC: - opaque ECCEncryptedPreMasterSecret<0..2^16-1>; - case ECDHE: - Opaque ClientECDHEParams<1..2^16-1>; - case IBSDH: - Opaque ClientIBSDHParams<1..2^16-1>; - case IBC: - opaque IBCEncryptedPreMasterSecret<0..2^16-1>; - case RSA: - opaque RSAEncryptedPreMasterSecret<0..2^16-1>; - } exchange_keys; -} ClientKeyExchange; -*/ - - // Handshakes int tlcp_send_client_hello(TLS_CONNECT *conn) @@ -382,17 +463,11 @@ int tlcp_send_client_hello(TLS_CONNECT *conn) int ret; if (!conn->recordlen) { - uint8_t exts[TLS_MAX_EXTENSIONS_SIZE]; uint8_t *pexts = exts; size_t extslen = 0; - if (!conn->ctx->cipher_suites_cnt) { - error_print(); - return -1; - } - - // TLCP only use sm4 and sm3 + conn->sig_alg = TLS_sig_sm2sig_sm3; conn->cipher = BLOCK_CIPHER_sm4(); conn->digest = DIGEST_sm3(); @@ -401,6 +476,9 @@ int tlcp_send_client_hello(TLS_CONNECT *conn) return -1; } + if (conn->verbose) + tls_trace("send ClientHello\n"); + tls_record_set_protocol(conn->record, TLS_protocol_tlcp); if (tls_random_generate(conn->client_random) != 1) { @@ -488,9 +566,7 @@ int tlcp_send_client_hello(TLS_CONNECT *conn) error_print(); return -1; } - if (conn->verbose) { - tls_trace("send ClientHello\n"); tlcp_record_print(stderr, 0, 0, conn->record, conn->recordlen); } @@ -501,8 +577,6 @@ int tlcp_send_client_hello(TLS_CONNECT *conn) if(conn->verbose) tls_handshake_digest_print(stderr, 0, 0, "ClientHello", &conn->dgst_ctx); - - if (conn->client_certificate_verify) { sm2_sign_update(&conn->sign_ctx, conn->record + 5, conn->recordlen - 5); } @@ -540,14 +614,14 @@ int tlcp_recv_server_hello(TLS_CONNECT *conn) size_t application_layer_protocol_negotiation_len; - if(conn->verbose) tls_trace("recv ServerHello\n"); - if ((ret = tls_recv_record(conn)) != 1) { if (ret != TLS_ERROR_RECV_AGAIN) { error_print(); } return ret; } + if (conn->verbose) + tls_trace("recv ServerHello\n"); if (conn->verbose) tlcp_record_print(stderr, 0, 0, conn->record, conn->recordlen); @@ -740,7 +814,6 @@ int tlcp_recv_server_certificate(TLS_CONNECT *conn) const uint8_t *server_cert; size_t server_cert_len; - if(conn->verbose) tls_trace("recv server Certificate\n"); if ((ret = tls_recv_record(conn)) != 1) { if (ret != TLS_ERROR_RECV_AGAIN) { @@ -748,6 +821,8 @@ int tlcp_recv_server_certificate(TLS_CONNECT *conn) } return ret; } + if (conn->verbose) + tls_trace("recv server Certificate\n"); if (conn->verbose) tlcp_record_print(stderr, 0, 0, conn->record, conn->recordlen); @@ -812,40 +887,29 @@ int tlcp_recv_server_certificate(TLS_CONNECT *conn) return 1; } -// 存疑 int tlcp_recv_server_key_exchange(TLS_CONNECT *conn) { int ret; const uint8_t *sig; size_t siglen; - const uint8_t *cp; - size_t len; - X509_KEY server_sign_key; - - const uint8_t *server_enc_cert; - size_t server_enc_cert_len; - - uint8_t server_ecc_params[TLS_MAX_CERTIFICATES_SIZE + 3]; - uint8_t *p; - size_t server_ecc_params_len; - const uint8_t *q; - size_t qlen; - const uint8_t *server_ecc_params_cert; - size_t server_ecc_params_cert_len; - + const uint8_t *sign_cert; + size_t sign_cert_len; + X509_KEY sign_key; + const uint8_t *enc_cert; + size_t enc_cert_len; + uint8_t enc_cert_header[3]; + uint8_t *enc_cert_header_ptr = enc_cert_header; + size_t enc_cert_header_len = 0; SM2_VERIFY_CTX verify_ctx; - - - - if(conn->verbose) tls_trace("recv ServerKeyExchange\n"); - if ((ret = tls_recv_record(conn)) != 1) { if (ret != TLS_ERROR_RECV_AGAIN) { error_print(); } return ret; } + if(conn->verbose) + tls_trace("recv ServerKeyExchange\n"); if (conn->verbose) tlcp_record_print(stderr, 0, 0, conn->record, conn->recordlen); @@ -854,70 +918,34 @@ int tlcp_recv_server_key_exchange(TLS_CONNECT *conn) tls_send_alert(conn, TLS_alert_protocol_version); return -1; } - - if (tls_record_get_handshake_server_key_exchange(conn->record, - TLS_server_key_exchange_ecc, NULL, 0, - &conn->sig_alg, &sig, &siglen) != 1) { + if (tlcp_record_get_handshake_server_key_exchange(conn->record, + TLS_server_key_exchange_ecc, NULL, 0, &sig, &siglen) != 1) { error_print(); tls_send_alert(conn, TLS_alert_unexpected_message); return -1; } - - if (conn->sig_alg != TLS_sig_sm2sig_sm3) { - error_print(); - tls_send_alert(conn, TLS_alert_illegal_parameter); - return -1; - } - - if (digest_update(&conn->dgst_ctx, conn->record + 5, conn->recordlen - 5) != 1) { error_print(); return -1; } - - if(conn->verbose) tls_handshake_digest_print(stderr, 0, 0, "ServerKeyExchange", &conn->dgst_ctx); + if(conn->verbose) + tls_handshake_digest_print(stderr, 0, 0, "ServerKeyExchange", &conn->dgst_ctx); // verify ServerKeyExchange - if (x509_certs_get_cert_by_index(conn->peer_cert_chain, conn->peer_cert_chain_len, 0, &cp, &len) != 1 - || x509_cert_get_subject_public_key(cp, len, &server_sign_key) != 1 - || x509_certs_get_cert_by_index(conn->peer_cert_chain, conn->peer_cert_chain_len, 1, &server_enc_cert, &server_enc_cert_len) != 1 - || x509_cert_get_subject_public_key(server_enc_cert, server_enc_cert_len, &conn->server_enc_key) != 1) { + if (x509_certs_get_cert_by_index(conn->peer_cert_chain, conn->peer_cert_chain_len, 0, &sign_cert, &sign_cert_len) != 1 + || x509_cert_get_subject_public_key(sign_cert, sign_cert_len, &sign_key) != 1 + || x509_certs_get_cert_by_index(conn->peer_cert_chain, conn->peer_cert_chain_len, 1, &enc_cert, &enc_cert_len) != 1 + || x509_cert_get_subject_public_key(enc_cert, enc_cert_len, &conn->server_enc_key) != 1) { // 这个不应该在这里取 error_print(); - tls_send_alert(conn, TLS_alert_bad_certificate); return -1; } + tls_uint24_to_bytes(enc_cert_len, &enc_cert_header_ptr, &enc_cert_header_len); - if (server_sign_key.algor != OID_ec_public_key - || server_sign_key.algor_param != OID_sm2 - || conn->server_enc_key.algor != OID_ec_public_key - || conn->server_enc_key.algor_param != OID_sm2) { - error_print(); - tls_send_alert(conn, TLS_alert_bad_certificate); - return -1; - } - p = server_ecc_params; - server_ecc_params_len = 0; - if (tlcp_server_ecc_params_to_bytes(server_enc_cert, server_enc_cert_len, - &p, &server_ecc_params_len) != 1) { - error_print(); - tls_send_alert(conn, TLS_alert_internal_error); - return -1; - } - q = server_ecc_params; - qlen = server_ecc_params_len; - if (tlcp_server_ecc_params_from_bytes(&server_ecc_params_cert, &server_ecc_params_cert_len, - &q, &qlen) != 1 - || qlen - || server_ecc_params_cert_len != server_enc_cert_len - || memcmp(server_ecc_params_cert, server_enc_cert, server_enc_cert_len) != 0) { - error_print(); - tls_send_alert(conn, TLS_alert_internal_error); - return -1; - } - if (sm2_verify_init(&verify_ctx, &server_sign_key.u.sm2_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1 + if (sm2_verify_init(&verify_ctx, &sign_key.u.sm2_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1 || sm2_verify_update(&verify_ctx, conn->client_random, 32) != 1 || sm2_verify_update(&verify_ctx, conn->server_random, 32) != 1 - || sm2_verify_update(&verify_ctx, server_ecc_params, server_ecc_params_len) != 1) { + || sm2_verify_update(&verify_ctx, enc_cert_header, enc_cert_header_len) != 1 + || sm2_verify_update(&verify_ctx, enc_cert, enc_cert_len) != 1) { error_print(); tls_send_alert(conn, TLS_alert_internal_error); return -1; @@ -927,7 +955,6 @@ int tlcp_recv_server_key_exchange(TLS_CONNECT *conn) tls_send_alert(conn, TLS_alert_decrypt_error); return -1; } - return 1; } @@ -963,13 +990,7 @@ int tlcp_recv_certificate_request(TLS_CONNECT *conn) } if (handshake_type != TLS_handshake_certificate_request) { conn->client_certs_len = 0; - - if(conn->verbose) { - fprintf(stderr, "%s %d: no certificate_request\n", __FILE__, __LINE__); - fprintf(stderr, "recordlen = %zu\n", conn->recordlen); - } - - return 0; // 表明对方没有发送预期的报文 + return 0; } if(conn->verbose) tls_trace("recv CertificateRequest\n"); @@ -1109,19 +1130,31 @@ int tlcp_send_client_certificate(TLS_CONNECT *conn) int tlcp_send_client_key_exchange(TLS_CONNECT *conn) { - uint8_t enced_pre_master_secret[SM2_MAX_CIPHERTEXT_SIZE]; - size_t enced_pre_master_secret_len; int ret; - if(conn->verbose) tls_trace("send ClientKeyExchange\n"); - if (!conn->recordlen) { + const uint8_t *enc_cert; + size_t enc_cert_len; + X509_KEY public_key; + uint8_t enced_pre_master_secret[SM2_MAX_CIPHERTEXT_SIZE]; + size_t enced_pre_master_secret_len; + + if (conn->verbose) + tls_trace("send ClientKeyExchange\n"); + + if (x509_certs_get_cert_by_index(conn->peer_cert_chain, conn->peer_cert_chain_len, 1, + &enc_cert, &enc_cert_len) != 1 + || x509_cert_get_subject_public_key(enc_cert, enc_cert_len, &public_key) != 1) { + error_print(); + return -1; + } + if (tls_pre_master_secret_generate(conn->pre_master_secret, TLS_protocol_tlcp) != 1) { error_print(); return -1; } - if (sm2_encrypt(&conn->server_enc_key.u.sm2_key, conn->pre_master_secret, 48, + if (sm2_encrypt(&public_key.u.sm2_key, conn->pre_master_secret, 48, enced_pre_master_secret, &enced_pre_master_secret_len) != 1) { error_print(); tls_send_alert(conn, TLS_alert_internal_error); @@ -1140,7 +1173,8 @@ int tlcp_send_client_key_exchange(TLS_CONNECT *conn) error_print(); return -1; } - if(conn->verbose) tls_handshake_digest_print(stderr, 0, 0, "ClientKeyExchange", &conn->dgst_ctx); + if (conn->verbose) + tls_handshake_digest_print(stderr, 0, 0, "ClientKeyExchange", &conn->dgst_ctx); } if ((ret = tls_send_record(conn)) != 1) { @@ -1289,8 +1323,7 @@ int tlcp_recv_server_finished(TLS_CONNECT *conn) return ret; } if (conn->verbose) - tlcp_record_print(stderr, 0, 0, conn->record, conn->recordlen); - + tls_encrypted_record_print(stderr, conn->record, conn->recordlen, 0, 0); if (tls_record_protocol(conn->record) != TLS_protocol_tlcp) { error_print(); @@ -1415,7 +1448,6 @@ static int tlcp_cert_chains_select(TLS_CONNECT *conn, conn->cert_chain = cert_chain; conn->cert_chain_len = cert_chain_len; conn->cert_chain_idx = cert_chain_idx; - conn->sig_alg = TLS_sig_sm2sig_sm3; conn->signature_algorithms[0] = TLS_sig_sm2sig_sm3; conn->signature_algorithms_cnt = 1; return 1; @@ -1459,7 +1491,7 @@ int tlcp_recv_client_hello(TLS_CONNECT *conn) const uint8_t *host_name = NULL; size_t host_name_len = 0; - // TLCP only use sm4 and sm3 + conn->sig_alg = TLS_sig_sm2sig_sm3; conn->cipher = BLOCK_CIPHER_sm4(); conn->digest = DIGEST_sm3(); @@ -1914,23 +1946,23 @@ int tlcp_send_server_certificate(TLS_CONNECT *conn) return 1; } - int tlcp_send_server_key_exchange(TLS_CONNECT *conn) { - SM2_SIGN_CTX sign_ctx; - uint8_t sigbuf[SM2_MAX_SIGNATURE_SIZE]; - size_t siglen; - const uint8_t *server_enc_cert; - size_t server_enc_cert_len; - uint8_t server_ecc_params[TLS_MAX_CERTIFICATES_SIZE + 3]; - uint8_t *p; - size_t server_ecc_params_len; int ret; - if(conn->verbose) tls_trace("send ServerKeyExchange\n"); - if (conn->recordlen == 0) { + const uint8_t *enc_cert; + size_t enc_cert_len; + uint8_t enc_cert_header[3]; + uint8_t *enc_cert_header_ptr = enc_cert_header; + size_t enc_cert_header_len = 0; X509_KEY *sign_key; + SM2_SIGN_CTX sign_ctx; + uint8_t sigbuf[SM2_MAX_SIGNATURE_SIZE]; + size_t siglen; + + if (conn->verbose) + tls_trace("send ServerKeyExchange\n"); if (!conn->cert_chain || !conn->cert_chain_len || !conn->cert_chain_idx) { error_print(); @@ -1939,22 +1971,15 @@ int tlcp_send_server_key_exchange(TLS_CONNECT *conn) } if (x509_certs_get_cert_by_index(conn->cert_chain, conn->cert_chain_len, 1, - &server_enc_cert, &server_enc_cert_len) != 1) { + &enc_cert, &enc_cert_len) != 1) { error_print(); return -1; } - - p = server_ecc_params; - server_ecc_params_len = 0; - if (tlcp_server_ecc_params_to_bytes(server_enc_cert, server_enc_cert_len, - &p, &server_ecc_params_len) != 1) { - error_print(); - tls_send_alert(conn, TLS_alert_internal_error); - return -1; - } + tls_uint24_to_bytes(enc_cert_len, &enc_cert_header_ptr, &enc_cert_header_len); sign_key = &conn->ctx->x509_keys[conn->cert_chain_idx - 1]; - if (sign_key->algor != OID_ec_public_key || sign_key->algor_param != OID_sm2) { + if (sign_key->algor != OID_ec_public_key + || sign_key->algor_param != OID_sm2) { error_print(); tls_send_alert(conn, TLS_alert_internal_error); return -1; @@ -1962,15 +1987,16 @@ int tlcp_send_server_key_exchange(TLS_CONNECT *conn) if (sm2_sign_init(&sign_ctx, &sign_key->u.sm2_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1 || sm2_sign_update(&sign_ctx, conn->client_random, 32) != 1 || sm2_sign_update(&sign_ctx, conn->server_random, 32) != 1 - || sm2_sign_update(&sign_ctx, server_ecc_params, server_ecc_params_len) != 1 + || sm2_sign_update(&sign_ctx, enc_cert_header, enc_cert_header_len) != 1 + || sm2_sign_update(&sign_ctx, enc_cert, enc_cert_len) != 1 || sm2_sign_finish(&sign_ctx, sigbuf, &siglen) != 1) { error_print(); tls_send_alert(conn, TLS_alert_internal_error); return -1; } - if (tls_record_set_handshake_server_key_exchange(conn->record, &conn->recordlen, - TLS_server_key_exchange_ecc, NULL, 0, conn->sig_alg, sigbuf, siglen) != 1) { + if (tlcp_record_set_handshake_server_key_exchange(conn->record, &conn->recordlen, + TLS_server_key_exchange_ecc, NULL, 0, sigbuf, siglen) != 1) { error_print(); tls_send_alert(conn, TLS_alert_internal_error); return -1; @@ -1982,7 +2008,8 @@ int tlcp_send_server_key_exchange(TLS_CONNECT *conn) error_print(); return -1; } - if(conn->verbose) tls_handshake_digest_print(stderr, 0, 0, "ServerKeyExchange", &conn->dgst_ctx); + if (conn->verbose) + tls_handshake_digest_print(stderr, 0, 0, "ServerKeyExchange", &conn->dgst_ctx); } if ((ret = tls_send_record(conn)) != 1) { diff --git a/src/tls.c b/src/tls.c index e697ae19..50202334 100644 --- a/src/tls.c +++ b/src/tls.c @@ -1764,126 +1764,6 @@ int tls_server_ecdh_params_from_bytes(int *key_exchange_group, return 1; } -int tls_record_set_handshake_server_key_exchange(uint8_t *record, size_t *recordlen, - int server_key_exchange_alg, - const uint8_t *server_ecdh_params, size_t server_ecdh_params_len, - int sig_alg, const uint8_t *sig, size_t siglen) -{ - const int type = TLS_handshake_server_key_exchange; - uint8_t *p = tls_handshake_data(tls_record_data(record)); - size_t len = 0; - - if (!record || !recordlen || !sig || !siglen) { - error_print(); - return -1; - } - if (!tls_signature_scheme_name(sig_alg)) { - error_print(); - return -1; - } - if (siglen > TLS_MAX_SIGNATURE_SIZE) { - error_print(); - return -1; - } - - switch (server_key_exchange_alg) { - case TLS_server_key_exchange_ecdhe: - if (!server_ecdh_params || !server_ecdh_params_len) { - error_print(); - return -1; - } - tls_array_to_bytes(server_ecdh_params, server_ecdh_params_len, &p, &len); - break; - case TLS_server_key_exchange_ecc: - if (server_ecdh_params || server_ecdh_params_len) { - error_print(); - return -1; - } - break; - default: - error_print(); - return -1; - } - - tls_uint16_to_bytes((uint16_t)sig_alg, &p, &len); - tls_uint16array_to_bytes(sig, siglen, &p, &len); - - tls_record_set_handshake(record, recordlen, type, NULL, len); - return 1; -} - -int tls_record_get_handshake_server_key_exchange(const uint8_t *record, - int server_key_exchange_alg, - const uint8_t **server_ecdh_params, size_t *server_ecdh_params_len, - int *sig_alg, const uint8_t **sig, size_t *siglen) -{ - int type; - const uint8_t *p; - size_t len; - uint16_t alg; - - if (!record || !sig_alg || !sig || !siglen) { - error_print(); - return -1; - } - if (tls_record_get_handshake(record, &type, &p, &len) != 1) { - error_print(); - return -1; - } - if (type != TLS_handshake_server_key_exchange) { - error_print(); - return 0; - } - - switch (server_key_exchange_alg) { - case TLS_server_key_exchange_ecdhe: - if (!server_ecdh_params || !server_ecdh_params_len) { - error_print(); - return -1; - } - *server_ecdh_params = p; - *server_ecdh_params_len = len; - { - int key_exchange_group; - const uint8_t *key_exchange; - size_t key_exchange_len; - - if (tls_server_ecdh_params_from_bytes(&key_exchange_group, - &key_exchange, &key_exchange_len, &p, &len) != 1) { - error_print(); - return -1; - } - } - *server_ecdh_params_len -= len; - break; - - case TLS_server_key_exchange_ecc: - if (server_ecdh_params || server_ecdh_params_len) { - error_print(); - return -1; - } - break; - - default: - error_print(); - return -1; - } - - if (tls_uint16_from_bytes(&alg, &p, &len) != 1 - || tls_uint16array_from_bytes(sig, siglen, &p, &len) != 1 - || tls_length_is_zero(len) != 1) { - error_print(); - return -1; - } - if (!tls_signature_scheme_name(alg)) { - error_print(); - return -1; - } - *sig_alg = alg; - - return 1; -} - int tls_record_set_handshake_server_hello_done(uint8_t *record, size_t *recordlen) { int type = TLS_handshake_server_hello_done; diff --git a/src/tls12.c b/src/tls12.c index 40e35c7f..56dcf0c1 100644 --- a/src/tls12.c +++ b/src/tls12.c @@ -765,6 +765,128 @@ static int tls12_select_parameters(TLS_CONNECT *conn, return 0; } +int tls12_record_set_handshake_server_key_exchange(uint8_t *record, size_t *recordlen, + int server_key_exchange_alg, const uint8_t *server_ecdh_params, size_t server_ecdh_params_len, + int sig_alg, const uint8_t *sig, size_t siglen) +{ + const int type = TLS_handshake_server_key_exchange; + uint8_t *p = tls_handshake_data(tls_record_data(record)); + size_t len = 0; + + if (!record || !recordlen || !sig || !siglen) { + error_print(); + return -1; + } + if (!tls_signature_scheme_name(sig_alg)) { + error_print(); + return -1; + } + if (siglen > TLS_MAX_SIGNATURE_SIZE) { + error_print(); + return -1; + } + + switch (server_key_exchange_alg) { + case TLS_server_key_exchange_ecdhe: + if (!server_ecdh_params || !server_ecdh_params_len) { + error_print(); + return -1; + } + tls_array_to_bytes(server_ecdh_params, server_ecdh_params_len, &p, &len); + break; + case TLS_server_key_exchange_ecc: + if (server_ecdh_params || server_ecdh_params_len) { + error_print(); + return -1; + } + break; + default: + error_print(); + return -1; + } + + tls_uint16_to_bytes((uint16_t)sig_alg, &p, &len); + tls_uint16array_to_bytes(sig, siglen, &p, &len); + + tls_record_set_handshake(record, recordlen, type, NULL, len); + return 1; +} + +int tls12_record_get_handshake_server_key_exchange(const uint8_t *record, + int server_key_exchange_alg, const uint8_t **server_ecdh_params, size_t *server_ecdh_params_len, + int *sig_alg, const uint8_t **sig, size_t *siglen) +{ + int type; + const uint8_t *p; + size_t len; + uint16_t alg; + + if (!record || !sig_alg || !sig || !siglen) { + error_print(); + return -1; + } + if (tls_record_get_handshake(record, &type, &p, &len) != 1) { + error_print(); + return -1; + } + if (type != TLS_handshake_server_key_exchange) { + error_print(); + return 0; + } + + switch (server_key_exchange_alg) { + case TLS_server_key_exchange_ecdhe: + if (!server_ecdh_params || !server_ecdh_params_len) { + error_print(); + return -1; + } + *server_ecdh_params = p; + *server_ecdh_params_len = len; + { + int key_exchange_group; + const uint8_t *key_exchange; + size_t key_exchange_len; + + if (tls_server_ecdh_params_from_bytes(&key_exchange_group, + &key_exchange, &key_exchange_len, &p, &len) != 1) { + error_print(); + return -1; + } + } + *server_ecdh_params_len -= len; + break; + + case TLS_server_key_exchange_ecc: + if (server_ecdh_params || server_ecdh_params_len) { + error_print(); + return -1; + } + break; + + default: + error_print(); + return -1; + } + + if (tls_uint16_from_bytes(&alg, &p, &len) != 1 + || tls_uint16array_from_bytes(sig, siglen, &p, &len) != 1 + || tls_length_is_zero(len) != 1) { + error_print(); + return -1; + } + if (!tls_signature_scheme_name(alg)) { + error_print(); + return -1; + } + if (!siglen) { + error_print(); + return -1; + } + *sig_alg = alg; + + return 1; +} + int tls_recv_client_hello(TLS_CONNECT *conn) { @@ -1705,9 +1827,8 @@ int tls_send_server_key_exchange(TLS_CONNECT *conn) } x509_sign_ctx_cleanup(&sign_ctx); - if (tls_record_set_handshake_server_key_exchange(conn->record, &conn->recordlen, - TLS_server_key_exchange_ecdhe, - server_ecdh_params, server_ecdh_params_len, + if (tls12_record_set_handshake_server_key_exchange(conn->record, &conn->recordlen, + TLS_server_key_exchange_ecdhe, server_ecdh_params, server_ecdh_params_len, conn->sig_alg, sig, siglen) != 1) { error_print(); tls_send_alert(conn, TLS_alert_internal_error); @@ -1851,9 +1972,8 @@ int tls_recv_server_key_exchange(TLS_CONNECT *conn) if(conn->verbose) tls12_record_print(stderr, conn->record, conn->recordlen, 0, 0); - if ((ret = tls_record_get_handshake_server_key_exchange(conn->record, - TLS_server_key_exchange_ecdhe, - &server_ecdh_params, &server_ecdh_params_len, + if ((ret = tls12_record_get_handshake_server_key_exchange(conn->record, + TLS_server_key_exchange_ecdhe, &server_ecdh_params, &server_ecdh_params_len, &sig_alg, &sig, &siglen)) < 0) { error_print(); tls_send_alert(conn, TLS_alert_decode_error); @@ -2470,7 +2590,6 @@ int tls_recv_change_cipher_spec(TLS_CONNECT *conn) int ret; int (*send_alert)(TLS_CONNECT *conn, int alert) = tls_send_alert; - if(conn->verbose) tls_trace("recv [ChangeCipherSpec]\n"); if (conn->is_client && conn->handshake_state == TLS_state_server_change_cipher_spec) { if (conn->protocol == TLS_protocol_tlcp) { send_alert = tlcp_send_alert; @@ -2484,6 +2603,8 @@ int tls_recv_change_cipher_spec(TLS_CONNECT *conn) } return ret; } + if(conn->verbose) + tls_trace("recv [ChangeCipherSpec]\n"); if (tls_record_protocol(conn->record) != conn->protocol) { error_print(); @@ -2725,25 +2846,24 @@ int tls_recv_server_finished(TLS_CONNECT *conn) format_bytes(stderr, 0, 0, ">>> verify_data", local_verify_data, 12); } - // Finished - if(conn->verbose) tls_trace("recv server Finished\n"); if ((ret = tls_recv_record(conn)) != 1) { if (ret != TLS_ERROR_RECV_AGAIN) { error_print(); } return ret; } + if(conn->verbose) + tls_trace("recv server Finished\n"); + if (tls_record_protocol(conn->record) != conn->protocol) { error_print(); tls12_send_alert(conn, TLS_alert_unexpected_message); return -1; } - if(conn->verbose) tls_trace("decrypt Finished\n"); - if (conn->verbose >= 5) { format_bytes(stderr, 0, 0, "server_seq_num", conn->server_seq_num, 8); } @@ -2755,7 +2875,8 @@ int tls_recv_server_finished(TLS_CONNECT *conn) tls12_send_alert(conn, TLS_alert_bad_record_mac); return -1; } - if(conn->verbose) tls12_record_print(stderr, conn->plain_record, conn->plain_recordlen, 0, 0); + if(conn->verbose) + tls12_record_print(stderr, conn->plain_record, conn->plain_recordlen, 0, 0); tls_seq_num_incr(conn->server_seq_num); diff --git a/src/tls_trace.c b/src/tls_trace.c index 47ed23bc..b5091cc8 100644 --- a/src/tls_trace.c +++ b/src/tls_trace.c @@ -813,12 +813,6 @@ int tls_server_key_exchange_ecdhe_print(FILE *fp, const uint8_t *data, size_t da return 1; } -// -// 这个函数依赖输入的cipher_suite，才能判断如何解析ServerKeyExchange -// 显然这个信息无法通过基础的fmt提供了，并且这个底层的信息一直需要从最上层提供，这就非常不好了 -// 目前来看，cipher_suite是否能够提供足够的信息呢？ -// ServerKeyExchange, ClientKeyExchange的格式是由cipher_suite决定的 - int tls_server_key_exchange_print(FILE *fp, int fmt, int ind, int cipher_suite, const uint8_t *data, size_t datalen) { diff --git a/tools/tlcp_client.c b/tools/tlcp_client.c index 6573e82d..59bfdcb6 100644 --- a/tools/tlcp_client.c +++ b/tools/tlcp_client.c @@ -290,7 +290,7 @@ int tlcp_client_main(int argc, char *argv[]) if (--argc < 1) goto bad; supported_group_name = *(++argv); if ((supported_group = tls_named_curve_from_name(supported_group_name)) == 0) { - fprintf(stderr, "%s: -supported_group '%s' not supported\n", prog, supported_group_name); + fprintf(stderr, "%s: -supported_group '%s' invalid\n", prog, supported_group_name); return -1; } supported_groups[supported_groups_cnt++] = supported_group; diff --git a/tools/tlcp_help.h b/tools/tlcp_help.h index eba5c06d..e01ccfa8 100644 --- a/tools/tlcp_help.h +++ b/tools/tlcp_help.h @@ -15,27 +15,25 @@ "\n" "Examples\n" "\n" -" gmssl sm2keygen -pass 1234 -out rootcakey.pem\n" -" gmssl certgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN ROOTCA -days 3650 -key rootcakey.pem -pass 1234 -out rootcacert.pem -key_usage keyCertSign -key_usage cRLSign -ca\n" -" gmssl sm2keygen -pass 1234 -out cakey.pem\n" -" gmssl reqgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN \"Sub CA\" -key cakey.pem -pass 1234 -out careq.pem\n" -" gmssl reqsign -in careq.pem -days 365 -key_usage keyCertSign -ca -path_len_constraint 0 -cacert rootcacert.pem -key rootcakey.pem -pass 1234 -out cacert.pem\n" +" gmssl sm2keygen -pass 1234 -out sm2rootcakey.pem\n" +" gmssl certgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN ROOTCA -days 3650 -key sm2rootcakey.pem -pass 1234 -out sm2rootcacert.pem -key_usage keyCertSign -key_usage cRLSign -ca\n" +" gmssl sm2keygen -pass 1234 -out sm2cakey.pem\n" +" gmssl reqgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN \"Sub CA\" -key sm2cakey.pem -pass 1234 -out sm2careq.pem\n" +" gmssl reqsign -in sm2careq.pem -days 365 -key_usage keyCertSign -ca -path_len_constraint 0 -cacert sm2rootcacert.pem -key sm2rootcakey.pem -pass 1234 -out sm2cacert.pem\n" "\n" -" gmssl sm2keygen -pass 1234 -out signkey.pem\n" -" gmssl reqgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN localhost -key signkey.pem -pass 1234 -out signreq.pem\n" -" gmssl reqsign -in signreq.pem -days 365 -key_usage digitalSignature -cacert cacert.pem -key cakey.pem -pass 1234 -out signcert.pem\n" +" gmssl sm2keygen -pass 1234 -out sm2signkey.pem\n" +" gmssl reqgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN localhost -key sm2signkey.pem -pass 1234 -out sm2signreq.pem\n" +" gmssl reqsign -in sm2signreq.pem -days 365 -key_usage digitalSignature -cacert sm2cacert.pem -key sm2cakey.pem -pass 1234 -out sm2signcert.pem\n" "\n" -" gmssl sm2keygen -pass 1234 -out enckey.pem\n" -" gmssl reqgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN localhost -key enckey.pem -pass 1234 -out encreq.pem\n" -" gmssl reqsign -in encreq.pem -days 365 -key_usage keyEncipherment -cacert cacert.pem -key cakey.pem -pass 1234 -out enccert.pem\n" +" gmssl sm2keygen -pass 1234 -out sm2enckey.pem\n" +" gmssl reqgen -C CN -ST Beijing -L Haidian -O PKU -OU CS -CN localhost -key sm2enckey.pem -pass 1234 -out sm2encreq.pem\n" +" gmssl reqsign -in sm2encreq.pem -days 365 -key_usage keyEncipherment -cacert sm2cacert.pem -key sm2cakey.pem -pass 1234 -out sm2enccert.pem\n" "\n" -" cat signcert.pem > double_certs.pem\n" -" cat enccert.pem >> double_certs.pem\n" -" cat cacert.pem >> double_certs.pem\n" -" # double_keys.pem contains two encrypted private key PEM blocks with the same password:\n" -" # the first is the signing private key, the second is the encryption private key.\n" -" cat signkey.pem > double_keys.pem\n" -" cat enckey.pem >> double_keys.pem\n" +" cat sm2signcert.pem > tlcpcert.pem\n" +" cat sm2enccert.pem >> tlcpcert.pem\n" +" cat sm2cacert.pem >> tlcpcert.pem\n" +" cat sm2signkey.pem > tlcpkey.pem\n" +" cat sm2enckey.pem >> tlcpkey.pem\n" "\n" -" gmssl tlcp_server -port 443 -cert double_certs.pem -key double_keys.pem -pass 1234\n" -" gmssl tlcp_client -host 127.0.0.1 -cacert rootcacert.pem\n" +" gmssl tlcp_server -port 4431 -cert tlcpcert.pem -key tlcpkey.pem -pass 1234\n" +" gmssl tlcp_client -port 4431 -host 127.0.0.1 -cacert sm2rootcacert.pem\n"