Remove warnings

CMakeLists.txt

@@ -133,6 +133,7 @@ set(tools
 	tools/sm4_ctr_sm3_hmac.c
 	tools/sm3.c
 	tools/sm3hmac.c
+	tools/sm3_pbkdf2.c
 	tools/sm3xmss_keygen.c
 	tools/sm2keygen.c
 	tools/sm2sign.c
@@ -148,7 +149,6 @@ set(tools
 	tools/zuc.c
 	tools/rand.c
 	tools/ghash.c
-	tools/pbkdf2.c
 	tools/certgen.c
 	tools/certparse.c
 	tools/certverify.c
@@ -507,13 +507,14 @@ endif()
 
 if (ENABLE_SDF)
 	message(STATUS "ENABLE_SDF is ON")
+	add_definitions(-DENABLE_SDF)
 	list(APPEND src
 		src/sdf/sdf.c
 		src/sdf/sdf_lib.c
 		src/sdf/sdf_meth.c
 		src/sdf/sdf_ext.c
 		src/sdf/sdf_sansec.c)
-	list(APPEND tools tools/sdfutil.c)
+	list(APPEND tools tools/sdfutil.c tools/sdftest.c)
 endif()
 
 

include/gmssl/tls.h

@@ -408,7 +408,7 @@ typedef struct {
 #define tls_record_protocol(record)	(((uint16_t)((record)[1]) << 8) | (record)[2])
 #define tls_record_data(record)		((record)+TLS_RECORD_HEADER_SIZE)
 #define tls_record_data_length(record)	(((uint16_t)((record)[3]) << 8) | (record)[4])
-#define tls_record_length(record)	(TLS_RECORD_HEADER_SIZE + tls_record_data_length(record))
+#define tls_record_length(record)	((size_t)(TLS_RECORD_HEADER_SIZE + tls_record_data_length(record)))
 
 int tls_record_set_type(uint8_t *record, int type);
 int tls_record_set_protocol(uint8_t *record, int protocol);

src/asn1.c

@@ -191,7 +191,7 @@ int asn1_length_from_der(size_t *len, const uint8_t **in, size_t *inlen)
 
 	} else {
 		uint8_t buf[4] = {0};
-		int nbytes  = *(*in)++ & 0x7f;
+		size_t nbytes  = *(*in)++ & 0x7f;
 		(*inlen)--;
 
 		if (nbytes < 1 || nbytes > 4) {

src/debug.c

@@ -66,7 +66,7 @@ int format_bytes(FILE *fp, int format, int indent, const char *str, const uint8_
 		return -1;
 	}
 
-	for (i = 0; i < indent; i++) {
+	for (i = 0; i < (size_t)indent; i++) {
 		fprintf(fp, " ");
 	}
 	fprintf(fp, "%s: ", str);

src/hmac.c

@@ -22,7 +22,7 @@ int hmac_init(HMAC_CTX *ctx, const DIGEST *digest, const uint8_t *key, size_t ke
 	uint8_t i_key[DIGEST_MAX_BLOCK_SIZE] = {0};
 	uint8_t o_key[DIGEST_MAX_BLOCK_SIZE] = {0};
 	size_t blocksize;
-	int i;
+	size_t i;
 
 	if (!ctx || !digest || !key || !keylen) {
 		error_print();

src/sm4_ccm.c

@@ -96,7 +96,7 @@ int sm4_ccm_encrypt(const SM4_KEY *sm4_key, const uint8_t *iv, size_t ivlen,
 		if (aadlen < ((1<<16) - (1<<8))) {
 			length_to_bytes(aadlen, 2, block);
 			alen = 2;
-		} else if (aadlen < ((size_t)1<<32)) {
+		} else if ((uint64_t)aadlen < ((uint64_t)1<<32)) {
 			block[0] = 0xff;
 			block[1] = 0xfe;
 			length_to_bytes(aadlen, 4, block + 2);

tests/sm4_cbctest.c

@@ -87,7 +87,6 @@ static int test_sm4_cbc_test_vectors(void)
 	uint8_t *ciphertext;
 	size_t ciphertext_len;
 	uint8_t *encrypted;
-	size_t encrypted_len;
 	size_t i;
 
 	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {

tests/sm4_ctrtest.c

@@ -87,9 +87,7 @@ static int test_sm4_ctr_test_vectors(void)
 
 	SM4_KEY sm4_key;
 	uint8_t *encrypted;
-	size_t encrypted_len;
 	uint8_t *decrypted;
-	size_t decrypted_len;
 	size_t i;
 
 	for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) {

tests/sm4test.c

@@ -192,7 +192,7 @@ static int speed_sm4_encrypt(void)
 	size_t nbytes = 16 * 1024 * 1024;
 	clock_t begin, end;
 	double seconds;
-	int i;
+	size_t i;
 
 	sm4_set_encrypt_key(&sm4_key, key);
 	for (i = 0; i < nbytes/sizeof(buf); i++) {

tools/gmssl.c

@@ -23,7 +23,6 @@ extern int crlget_main(int argc, char **argv);
 extern int crlgen_main(int argc, char **argv);
 extern int crlparse_main(int argc, char **argv);
 extern int crlverify_main(int argc, char **argv);
-extern int pbkdf2_main(int argc, char **argv);
 extern int reqgen_main(int argc, char **argv);
 extern int reqparse_main(int argc, char **argv);
 extern int reqsign_main(int argc, char **argv);
@@ -34,8 +33,8 @@ extern int sm2encrypt_main(int argc, char **argv);
 extern int sm2decrypt_main(int argc, char **argv);
 extern int sm3_main(int argc, char **argv);
 extern int sm3hmac_main(int argc, char **argv);
+extern int sm3_pbkdf2_main(int argc, char **argv);
 extern int sm3xmss_keygen_main(int argc, char **argv);
-extern int sm4_main(int argc, char **argv);
 extern int sm4_ecb_main(int argc, char **argv);
 extern int sm4_cbc_main(int argc, char **argv);
 extern int sm4_ctr_main(int argc, char **argv);
@@ -68,6 +67,7 @@ extern int tls13_client_main(int argc, char **argv);
 extern int tls13_server_main(int argc, char **argv);
 #ifdef ENABLE_SDF
 extern int sdfutil_main(int argc, char **argv);
+extern int sdftest_main(int argc, char **argv);
 #endif
 #ifdef ENABLE_SKF
 extern int skfutil_main(int argc, char **argv);
@@ -88,8 +88,8 @@ static const char *options =
 	"  sm2decrypt        Decrypt with SM2 private key\n"
 	"  sm3               Generate SM3 hash\n"
 	"  sm3hmac           Generate SM3 HMAC tag\n"
+	"  sm3_pbkdf2        Hash password into key using PBKDF2 algoritm\n"
 	"  sm3xmss_keygen    Generate SM3-XMSS keypair\n"
-	"  sm4               Encrypt or decrypt with SM4\n"
 	"  sm4_ecb           Encrypt or decrypt with SM4 ECB\n"
 	"  sm4_cbc           Encrypt or decrypt with SM4 CBC\n"
 	"  sm4_ctr           Encrypt or decrypt with SM4 CTR\n"
@@ -109,7 +109,6 @@ static const char *options =
 	"  sm9verify         Verify SM9 signature\n"
 	"  sm9encrypt        SM9 public key encryption\n"
 	"  sm9decrypt        SM9 decryption\n"
-	"  pbkdf2            Generate key from password\n"
 	"  reqgen            Generate certificate signing request (CSR)\n"
 	"  reqsign           Generate certificate from CSR\n"
 	"  reqparse          Parse and print a CSR\n"
@@ -128,6 +127,7 @@ static const char *options =
 	"  cmsverify         Verify CMS SignedData\n"
 #ifdef ENABLE_SDF
 	"  sdfutil           SDF crypto device utility\n"
+	"  sdftest           Test vendor's SDF library and device\n"
 #endif
 #ifdef ENABLE_SKF
 	"  skfutil           SKF crypto device utility\n"
@@ -186,8 +186,6 @@ int main(int argc, char **argv)
 			return reqparse_main(argc, argv);
 		} else if (!strcmp(*argv, "reqsign")) {
 			return reqsign_main(argc, argv);
-		} else if (!strcmp(*argv, "pbkdf2")) {
-			return pbkdf2_main(argc, argv);
 		} else if (!strcmp(*argv, "sm2keygen")) {
 			return sm2keygen_main(argc, argv);
 		} else if (!strcmp(*argv, "sm2sign")) {
@@ -202,10 +200,10 @@ int main(int argc, char **argv)
 			return sm3_main(argc, argv);
 		} else if (!strcmp(*argv, "sm3hmac")) {
 			return sm3hmac_main(argc, argv);
+		} else if (!strcmp(*argv, "sm3_pbkdf2")) {
+			return sm3_pbkdf2_main(argc, argv);
 		} else if (!strcmp(*argv, "sm3xmss_keygen")) {
 			return sm3xmss_keygen_main(argc, argv);
-		} else if (!strcmp(*argv, "sm4")) {
-			return sm4_main(argc, argv);
 #if ENABLE_SM4_ECB
 		} else if (!strcmp(*argv, "sm4_ecb")) {
 			return sm4_ecb_main(argc, argv);
@@ -281,6 +279,8 @@ int main(int argc, char **argv)
 #ifdef ENABLE_SDF
 		} else if (!strcmp(*argv, "sdfutil")) {
 			return sdfutil_main(argc, argv);
+		} else if (!strcmp(*argv, "sdftest")) {
+			return sdftest_main(argc, argv);
 #endif
 #ifdef ENABLE_SKF
 		} else if (!strcmp(*argv, "skfutil")) {