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

Remove warnings

Browse Source
This commit is contained in:
Zhi Guan
2022-10-14 17:39:17 +08:00
parent 4744848ee4
commit a9c5e99192
6 changed files with 19 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rand_win.c
View File

@@ -18,7 +18,7 @@
int rand_bytes(uint8_t *buf, size_t len) int rand_bytes(uint8_t *buf, size_t len)
{ {
HCRYPTPROV hCryptProv = NULL; HCRYPTPROV hCryptProv;
int ret = -1; int ret = -1;
if (!buf) { if (!buf) {

31
src/sgd.h
View File

@@ -275,34 +275,9 @@ typedef int32_t SGD_BOOL;
#define SGD_STATUS_READY 0x00000202 #define SGD_STATUS_READY 0x00000202
#define SGD_STATUS_EXCEPTION 0x00000203 #define SGD_STATUS_EXCEPTION 0x00000203
/* SKF */ #ifdef WIN32
#ifndef WIN32 #include <windows.h>
typedef signed char INT8;
typedef signed short INT16;
typedef signed int INT32;
typedef unsigned char UINT8;
typedef unsigned short UINT16;
typedef unsigned int UINT32;
typedef long BOOL;
typedef UINT8 BYTE;
typedef UINT8 CHAR;
typedef INT16 SHORT;
typedef UINT16 USHORT;
# ifndef SGD_NATIVE_LONG
typedef INT32 LONG;
typedef UINT32 ULONG;
# else
typedef long LONG;
typedef unsigned long ULONG;
# endif
typedef UINT32 UINT;
typedef UINT16 WORD;
typedef UINT32 DWORD;
typedef UINT32 FLAGS;
typedef CHAR * LPSTR;
typedef void * HANDLE;
#else #else
#ifndef _WINDEF_H
typedef signed char INT8; typedef signed char INT8;
typedef signed short INT16; typedef signed short INT16;
typedef signed int INT32; typedef signed int INT32;
@@ -328,7 +303,7 @@ typedef UINT32 FLAGS;
typedef CHAR * LPSTR; typedef CHAR * LPSTR;
typedef void * HANDLE; typedef void * HANDLE;
#endif #endif
#endif
typedef HANDLE DEVHANDLE; typedef HANDLE DEVHANDLE;
typedef HANDLE HAPPLICATION; typedef HANDLE HAPPLICATION;

4
src/tlcp.c
View File

@@ -301,7 +301,7 @@ int tlcp_do_connect(TLS_CONNECT *conn)
goto end; goto end;
} }
p = server_enc_cert_lenbuf; len = 0; p = server_enc_cert_lenbuf; len = 0;
tls_uint24_to_bytes(server_enc_cert_len, &p, &len); tls_uint24_to_bytes((uint24_t)server_enc_cert_len, &p, &len);
if (sm2_verify_init(&verify_ctx, &server_sign_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1 if (sm2_verify_init(&verify_ctx, &server_sign_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1
|| sm2_verify_update(&verify_ctx, client_random, 32) != 1 || sm2_verify_update(&verify_ctx, client_random, 32) != 1
|| sm2_verify_update(&verify_ctx, server_random, 32) != 1 || sm2_verify_update(&verify_ctx, server_random, 32) != 1
@@ -731,7 +731,7 @@ int tlcp_do_accept(TLS_CONNECT *conn)
goto end; goto end;
} }
p = server_enc_cert_lenbuf; len = 0; p = server_enc_cert_lenbuf; len = 0;
tls_uint24_to_bytes(server_enc_cert_len, &p, &len); tls_uint24_to_bytes((uint24_t)server_enc_cert_len, &p, &len);
if (sm2_sign_init(&sign_ctx, &conn->sign_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1 if (sm2_sign_init(&sign_ctx, &conn->sign_key, SM2_DEFAULT_ID, SM2_DEFAULT_ID_LENGTH) != 1
|| sm2_sign_update(&sign_ctx, client_random, 32) != 1 || sm2_sign_update(&sign_ctx, client_random, 32) != 1
|| sm2_sign_update(&sign_ctx, server_random, 32) != 1 || sm2_sign_update(&sign_ctx, server_random, 32) != 1

8
src/tls12.c
View File

@@ -217,7 +217,6 @@ int tls12_do_connect(TLS_CONNECT *conn)
SM2_KEY server_sign_key; SM2_KEY server_sign_key;
SM2_SIGN_CTX verify_ctx;
SM2_SIGN_CTX sign_ctx; SM2_SIGN_CTX sign_ctx;
const uint8_t *sig; const uint8_t *sig;
size_t siglen; size_t siglen;
@@ -228,11 +227,8 @@ int tls12_do_connect(TLS_CONNECT *conn)
const uint8_t *verify_data; const uint8_t *verify_data;
size_t verify_data_len; size_t verify_data_len;
uint8_t local_verify_data[12]; uint8_t local_verify_data[12];
int handshake_type; int handshake_type;
const uint8_t *server_enc_cert; // 这几个值也是不需要的
size_t server_enc_cert_len;
uint8_t server_enc_cert_lenbuf[3];
const uint8_t *cp; const uint8_t *cp;
uint8_t *p; uint8_t *p;
size_t len; size_t len;
@@ -708,7 +704,6 @@ int tls12_do_accept(TLS_CONNECT *conn)
// ClientKeyExchange // ClientKeyExchange
SM2_POINT client_ecdhe_point; SM2_POINT client_ecdhe_point;
uint8_t pre_master_secret[SM2_MAX_PLAINTEXT_SIZE]; // sm2_decrypt 保证输出不会溢出 uint8_t pre_master_secret[SM2_MAX_PLAINTEXT_SIZE]; // sm2_decrypt 保证输出不会溢出
size_t pre_master_secret_len;
// Finished // Finished
SM3_CTX sm3_ctx; SM3_CTX sm3_ctx;
@@ -718,7 +713,6 @@ int tls12_do_accept(TLS_CONNECT *conn)
const uint8_t *verify_data; const uint8_t *verify_data;
size_t verify_data_len; size_t verify_data_len;
uint8_t *p;
const uint8_t *cp; const uint8_t *cp;
size_t len; size_t len;

29
src/tls13.c
View File

@@ -101,8 +101,8 @@ int tls13_gcm_encrypt(const BLOCK_CIPHER_KEY *key, const uint8_t iv[12],
aad[0] = TLS_record_application_data; aad[0] = TLS_record_application_data;
aad[1] = 0x03; //TLS_protocol_tls12_major; aad[1] = 0x03; //TLS_protocol_tls12_major;
aad[2] = 0x03; //TLS_protocol_tls12_minor; aad[2] = 0x03; //TLS_protocol_tls12_minor;
aad[3] = clen >> 8; aad[3] = (uint8_t)(clen >> 8);
aad[4] = clen; aad[4] = (uint8_t)(clen);
gmac = out + mlen; gmac = out + mlen;
if (gcm_encrypt(key, nonce, sizeof(nonce), aad, sizeof(aad), mbuf, mlen, out, 16, gmac) != 1) { if (gcm_encrypt(key, nonce, sizeof(nonce), aad, sizeof(aad), mbuf, mlen, out, 16, gmac) != 1) {
@@ -124,7 +124,6 @@ int tls13_gcm_decrypt(const BLOCK_CIPHER_KEY *key, const uint8_t iv[12],
uint8_t aad[5]; uint8_t aad[5];
size_t mlen; size_t mlen;
const uint8_t *gmac; const uint8_t *gmac;
size_t i;
// nonce = (zeros|seq_num) xor (iv) // nonce = (zeros|seq_num) xor (iv)
nonce[0] = nonce[1] = nonce[2] = nonce[3] = 0; nonce[0] = nonce[1] = nonce[2] = nonce[3] = 0;
@@ -135,8 +134,8 @@ int tls13_gcm_decrypt(const BLOCK_CIPHER_KEY *key, const uint8_t iv[12],
aad[0] = TLS_record_application_data; aad[0] = TLS_record_application_data;
aad[1] = 0x03; //TLS_protocol_tls12_major; aad[1] = 0x03; //TLS_protocol_tls12_major;
aad[2] = 0x03; //TLS_protocol_tls12_minor; aad[2] = 0x03; //TLS_protocol_tls12_minor;
aad[3] = inlen >> 8; aad[3] = (uint8_t)(inlen >> 8);
aad[4] = inlen; aad[4] = (uint8_t)(inlen);
if (inlen < GHASH_SIZE) { if (inlen < GHASH_SIZE) {
error_print(); error_print();
@@ -182,8 +181,8 @@ int tls13_record_encrypt(const BLOCK_CIPHER_KEY *key, const uint8_t iv[12],
enced_record[0] = TLS_record_application_data; // 显然这个不太对啊 enced_record[0] = TLS_record_application_data; // 显然这个不太对啊
enced_record[1] = 0x03; //TLS_protocol_tls12_major; enced_record[1] = 0x03; //TLS_protocol_tls12_major;
enced_record[2] = 0x03; //TLS_protocol_tls12_minor; enced_record[2] = 0x03; //TLS_protocol_tls12_minor;
enced_record[3] = (*enced_recordlen) >> 8; enced_record[3] = (uint8_t)((*enced_recordlen) >> 8);
enced_record[4] = (*enced_recordlen); enced_record[4] = (uint8_t)(*enced_recordlen);
(*enced_recordlen) += 5; (*enced_recordlen) += 5;
return 1; return 1;
@@ -204,8 +203,8 @@ int tls13_record_decrypt(const BLOCK_CIPHER_KEY *key, const uint8_t iv[12],
record[0] = record_type; record[0] = record_type;
record[1] = 0x03; //TLS_protocol_tls12_major; record[1] = 0x03; //TLS_protocol_tls12_major;
record[2] = 0x03; //TLS_protocol_tls12_minor; record[2] = 0x03; //TLS_protocol_tls12_minor;
record[3] = (*recordlen) >> 8; record[3] = (uint8_t)((*recordlen) >> 8);
record[4] = (*recordlen); record[4] = (uint8_t)(*recordlen);
(*recordlen) += 5; (*recordlen) += 5;
return 1; return 1;
@@ -242,8 +241,8 @@ int tls13_send(TLS_CONNECT *conn, const uint8_t *data, size_t datalen, size_t *s
record[0] = TLS_record_application_data; record[0] = TLS_record_application_data;
record[1] = TLS_protocol_tls12 >> 8; record[1] = TLS_protocol_tls12 >> 8;
record[2] = TLS_protocol_tls12 & 0xff; record[2] = TLS_protocol_tls12 & 0xff;
record[3] = recordlen >> 8; record[3] = (uint8_t)(recordlen >> 8);
record[4] = recordlen; record[4] = (uint8_t)(recordlen);
recordlen += 5; recordlen += 5;
tls_record_send(record, recordlen, conn->sock); tls_record_send(record, recordlen, conn->sock);
@@ -412,7 +411,7 @@ int tls13_hkdf_expand_label(const DIGEST *digest, const uint8_t secret[32],
uint8_t *p = hkdf_label; uint8_t *p = hkdf_label;
size_t hkdf_label_len = 0; size_t hkdf_label_len = 0;
label_len = strlen("tls13 ") + strlen(label); label_len = (uint8_t)(strlen("tls13 ") + strlen(label)); //FIXME: check length < 255
tls_uint16_to_bytes((uint16_t)outlen, &p, &hkdf_label_len); tls_uint16_to_bytes((uint16_t)outlen, &p, &hkdf_label_len);
tls_uint8_to_bytes(label_len, &p, &hkdf_label_len); tls_uint8_to_bytes(label_len, &p, &hkdf_label_len);
tls_array_to_bytes((uint8_t *)"tls13 ", strlen("tls13 "), &p, &hkdf_label_len); tls_array_to_bytes((uint8_t *)"tls13 ", strlen("tls13 "), &p, &hkdf_label_len);
@@ -712,8 +711,6 @@ int tls13_server_hello_extensions_get(const uint8_t *exts, size_t extslen, SM2_P
uint16_t ext_type; uint16_t ext_type;
const uint8_t *ext_data; const uint8_t *ext_data;
size_t ext_datalen; size_t ext_datalen;
const uint8_t *p;
size_t len;
tls_uint16_from_bytes(&ext_type, &exts, &extslen); tls_uint16_from_bytes(&ext_type, &exts, &extslen);
tls_uint16array_from_bytes(&ext_data, &ext_datalen, &exts, &extslen); tls_uint16array_from_bytes(&ext_data, &ext_datalen, &exts, &extslen);
@@ -1498,8 +1495,6 @@ int tls13_do_connect(TLS_CONNECT *conn)
const uint8_t *cert; const uint8_t *cert;
size_t certlen; size_t certlen;
uint8_t *p;
conn->is_client = 1; conn->is_client = 1;
tls_record_set_protocol(enced_record, TLS_protocol_tls12); tls_record_set_protocol(enced_record, TLS_protocol_tls12);
@@ -1937,7 +1932,6 @@ int tls13_do_accept(TLS_CONNECT *conn)
const uint8_t *client_verify_data; const uint8_t *client_verify_data;
size_t client_verify_data_len; size_t client_verify_data_len;
size_t i;
uint8_t client_write_key[16]; uint8_t client_write_key[16];
uint8_t server_write_key[16]; uint8_t server_write_key[16];
@@ -1945,7 +1939,6 @@ int tls13_do_accept(TLS_CONNECT *conn)
uint8_t zeros[32] = {0}; uint8_t zeros[32] = {0};
uint8_t psk[32] = {0}; uint8_t psk[32] = {0};
uint8_t early_secret[32]; uint8_t early_secret[32];
uint8_t binder_key[32];
uint8_t handshake_secret[32]; uint8_t handshake_secret[32];
uint8_t client_handshake_traffic_secret[32]; uint8_t client_handshake_traffic_secret[32];
uint8_t server_handshake_traffic_secret[32]; uint8_t server_handshake_traffic_secret[32];

2
src/tls_trace.c
View File

@@ -588,7 +588,7 @@ int tls_server_hello_print(FILE *fp, const uint8_t *data, size_t datalen, int fo
uint16_t cipher_suite; uint16_t cipher_suite;
uint8_t comp_meth; uint8_t comp_meth;
const uint8_t *exts; const uint8_t *exts;
size_t session_id_len, cipher_suites_len, comp_meths_len, exts_len; size_t session_id_len, exts_len;
format_print(fp, format, indent, "ServerHello\n"); indent += 4; format_print(fp, format, indent, "ServerHello\n"); indent += 4;
if (tls_uint16_from_bytes(&protocol, &data, &datalen) != 1) goto bad; if (tls_uint16_from_bytes(&protocol, &data, &datalen) != 1) goto bad;