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

Remove warnings

Browse Source
This commit is contained in:
Zhi Guan
2022-10-13 16:16:42 +08:00
parent c39889b7d0
commit dbc5b316b5
13 changed files with 44 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/cmstest.c
View File

@@ -1,4 +1,4 @@
/*
/*
* Copyright 2014-2022 The GmSSL Project. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the License); you may
@@ -170,8 +170,6 @@ static int test_cms_enced_content_info_encrypt(void)
int oid;
int cipher;
const uint8_t *piv;
size_t ivlen;
uint8_t data2[256];
const uint8_t *shared_info1;
size_t shared_info1_len;
@@ -564,7 +562,6 @@ static int test_cms_signed_data(void)
uint8_t name[256];
size_t namelen = 0;
time_t not_before, not_after;
uint8_t subject[256];
size_t subject_len = 0;
uint8_t *p = cert;
const uint8_t *cp = cert;
@@ -742,13 +739,11 @@ int test_cms_enveloped_data(void)
uint8_t name1[256];
size_t name1_len;
uint8_t serial1[20];
size_t serial1_len;
SM2_KEY sm2_key2;
uint8_t name2[256];
size_t name2_len;
uint8_t serial2[20];
size_t serial2_len;
time_t not_before, not_after;
@@ -882,30 +877,6 @@ int test_cms_enveloped_data(void)
static int test_cms_signed_and_enveloped_data(void)
{
/*
444 int cms_signed_and_enveloped_data_encipher_to_der(
445 const CMS_CERTS_AND_KEY *signers, size_t signers_cnt,
446 const uint8_t *rcpt_certs, size_t rcpt_certs_len,
447 int enc_algor, const uint8_t *key, size_t keylen, const uint8_t *iv, size_t ivlen,
448 int content_type, const uint8_t *content, size_t content_len,
449 const uint8_t *signers_crls, size_t signers_crls_len,
450 const uint8_t *shared_info1, size_t shared_info1_len,
451 const uint8_t *shared_info2, size_t shared_info2_len,
452 uint8_t **out, size_t *outlen);
453 int cms_signed_and_enveloped_data_decipher_from_der(
454 const SM2_KEY *rcpt_key,
455 const uint8_t *rcpt_issuer, size_t rcpt_issuer_len,
456 const uint8_t *rcpt_serial, size_t rcpt_serial_len,
457 int *content_type, uint8_t *content, size_t *content_len,
458 const uint8_t **prcpt_infos, size_t *prcpt_infos_len,
459 const uint8_t **shared_info1, size_t *shared_info1_len,
460 const uint8_t **shared_info2, size_t *shared_info2_len,
461 const uint8_t **certs, size_t *certs_len,
462 const uint8_t **crls, size_t *crls_len,
463 const uint8_t **psigner_infos, size_t *psigner_infos_len,
464 const uint8_t *extra_certs, size_t extra_certs_len,
465 const uint8_t *extra_crls, size_t extra_crls_len,
466 const uint8_t **in, size_t *inlen);
*/
SM2_KEY sign_key;
SM2_KEY decr_key;
@@ -914,14 +885,7 @@ static int test_cms_signed_and_enveloped_data(void)
uint8_t sign_serial[20];
uint8_t sign_name[256];
size_t sign_name_len;
*/
printf("%s() ok\n", __FUNCTION__);
return 1;

3
tests/md5test.c
View File

@@ -40,7 +40,6 @@ static char *dgsthex[] = {
int main(int argc, char **argv)
{
int err = 0;
char *p;
uint8_t dgst[16];
uint8_t dgstbuf[16];
size_t dgstbuflen;
@@ -61,7 +60,7 @@ int main(int argc, char **argv)
printf(" digest(error) = %s\n", dgsthex[i]);
err++;
} else {
printf("md5 test %lu ok\n", i+1);
printf("md5 test %zu ok\n", i+1);
}
}

4
tests/sha1test.c
View File

@@ -56,7 +56,7 @@ int main(void)
sha1_finish(&ctx, dgst);
if (memcmp(dgstbuf, dgst, sizeof(dgst)) != 0) {
printf("sha1 test %lu failed\n", i+1);
printf("sha1 test %zu failed\n", i+1);
printf("%s\n", dgsthex[i]);
for (j = 0; j < sizeof(dgst); j++) {
printf("%02X", dgst[j]);
@@ -64,7 +64,7 @@ int main(void)
printf("\n");
err++;
} else {
printf("sha1 test %lu ok\n", i+1);
printf("sha1 test %zu ok\n", i+1);
}
}

1
tests/tlstest.c
View File

@@ -171,7 +171,6 @@ static int test_tls_server_hello(void)
static int test_tls_certificate(void)
{
uint8_t record[1024];
size_t recordlen = 0;
FILE *fp = NULL;

1
tests/x509_exttest.c
View File

@@ -681,7 +681,6 @@ static int test_x509_ext_key_usage(void)
};
int oids[16] = {0};
size_t oids_cnt;
int i;
if (x509_ext_key_usage_to_der(kp, sizeof(kp)/sizeof(int), &p, &len) != 1
|| asn1_sequence_from_der(&d, &dlen, &cp, &len) != 1

8
tests/x509_reqtest.c
View File

@@ -134,17 +134,9 @@ static int test_x509_req(void)
uint8_t subject[256];
size_t subject_len;
SM2_KEY sm2_key;
uint8_t req[512];
size_t reqlen = 0;
int version;
const uint8_t *subj;
size_t subj_len;
SM2_KEY pub_key;
const uint8_t *attrs;
size_t attrs_len;
if (sm2_key_generate(&sm2_key) != 1
|| x509_name_set(subject, &subject_len, sizeof(subject), "CN", "Beijing", "Haidian", "PKU", "CS", "CA") != 1
|| x509_req_sign(req, &reqlen, sizeof(req),

5
tests/x509test.c
View File

@@ -32,7 +32,7 @@ static int test_x509_version(void)
uint8_t *p = buf;
const uint8_t *cp = buf;
size_t len = 0;
size_t i;
int i;
format_print(stderr, 0, 0, "Version\n");
for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {
@@ -65,7 +65,6 @@ static int test_x509_validity(void)
uint8_t *p = buf;
const uint8_t *cp = buf;
size_t len = 0;
size_t i;
time(&not_before);
@@ -239,7 +238,6 @@ static int set_x509_name(uint8_t *name, size_t *namelen, size_t maxlen)
static int test_x509_tbs_cert(void)
{
uint8_t serial[20] = { 0x01, 0x00 };
size_t serial_len;
uint8_t issuer[256];
size_t issuer_len = 0;
time_t not_before, not_after;
@@ -311,7 +309,6 @@ static int test_x509_cert_get(const uint8_t *cert, size_t certlen)
static int test_x509_cert(void)
{
uint8_t serial[20] = { 0x01, 0x00 };
size_t serial_len;
uint8_t issuer[256];
size_t issuer_len = 0;
time_t not_before, not_after;