Update version

.github/workflows/cmake.yml

@@ -36,5 +36,5 @@ jobs:
       working-directory: ${{github.workspace}}/build
       # Execute tests defined by the CMake configuration.
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C ${{env.BUILD_TYPE}}
+      run: ctest --rerun-failed --output-on-failure -C ${{env.BUILD_TYPE}}
 

CMakeLists.txt

@@ -386,7 +386,7 @@ endif()
 
 set(CPACK_PACKAGE_NAME "GmSSL")
 set(CPACK_PACKAGE_VENDOR "GmSSL develop team")
-set(CPACK_PACKAGE_VERSION "3.1.1-PR1")
+set(CPACK_PACKAGE_VERSION "3.1.1")
 
 set(CPACK_RPM_PACKAGE_GROUP "GmSSL Group")
 set(CPACK_PACKAGE_VENDOR "GmSSL Vendor")

include/gmssl/version.h

@@ -21,7 +21,7 @@ extern "C" {
 
 // Also update CPACK_PACKAGE_VERSION in CMakeLists.txt
 #define GMSSL_VERSION_NUM	30101
-#define GMSSL_VERSION_STR	"GmSSL 3.1.1 PR1"
+#define GMSSL_VERSION_STR	"GmSSL 3.1.1"
 
 _gmssl_export int gmssl_version_num(void);
 _gmssl_export const char *gmssl_version_str(void);

src/cms.c

@@ -356,12 +356,14 @@ int cms_enced_content_info_encrypt_to_der(
 
 	if (enc_algor != OID_sm4_cbc || keylen != 16 || ivlen != 16) {
 		error_print();
+		if (enced_content) free(enced_content);
 		return -1;
 	}
 
 	sm4_set_encrypt_key(&sm4_key, key);
 	if (sm4_cbc_padding_encrypt(&sm4_key, iv, content, content_len,
 		enced_content, &enced_content_len) != 1) {
+		if (enced_content) free(enced_content);
 		memset(&sm4_key, 0, sizeof(SM4_KEY));
 		error_print();
 		return -1;
@@ -373,9 +375,12 @@ int cms_enced_content_info_encrypt_to_der(
 		shared_info1, shared_info1_len,
 		shared_info2, shared_info2_len,
 		out, outlen)) != 1) {
+		if (enced_content) free(enced_content);
 		if (ret < 0) error_print();
 		return ret;
 	}
+
+	free(enced_content); //FIXME: use goto end to clean enced_content
 	return 1;
 }
 

tools/README.md

@@ -1,41 +0,0 @@
-# 命令行工具
-
-注意：
-
-* 命令行工具接口在v3版本正式发布前还会有较大调整
-* SM2, SM3, SM4等算法的命令相对比较底层，是对C语言接口的简单封装，命令行的应用开发者需要组合使用这些指令
-
-命令行工具：
-
-* `sm3` 计算SM3杂凑值，支持带公钥和ID的Z值计算
-* `sm3hmac` 计算SM3-HMAC值
-* `sm2keygen` 生成SM2密钥对，以PKCS #8口令加密的PEM格式存储
-* `sm2sign`,`sm2verify` SM2签名和验证，生成DER二进制编码的SM2签名值
-* `sm2encrypt`,`sm2decrypt` SM2加解密，注意只支持较短的消息加密
-* `reqgen` 生成PKCS #10证书签名请求PEM文件
-* `reqparse` 解析打印REQ文件
-* `reqsign` CA用私钥对REQ文件签名，生成证书
-* `certgen`生成自签名证书
-* `certparse` 解析打印证书
-* `certverify` 验证证书链
-
-TLS功能
-
-* `tlcp_client`
-* `tlcp_server`
-* `tls12_client`
-* `tls12_server`
-* `tls13_client`
-* `tls13_server`
-
-私钥总是默认以口令加密的方式存储
-SM3/HMAC-SM3 以二进制的格式输出
-签名和SM2Ciphertext以DER编码输出
-
-
-应该提供一个口令导出密钥的算法，由口令导出密钥
-
-SM4加密需要外部提供key, iv
-HMAC-SM3可以用命令行的方式拼合
-因此没必要提供一个单独的SM4-CBC-HMAC-SM3
-

tools/cmsencrypt.c

@@ -229,6 +229,7 @@ end:
 	if (infile && infp) fclose(infp);
 	if (outfile && outfp) fclose(outfp);
 	if (rcpt_certs) free(rcpt_certs);
+	if (inbuf) free(inbuf);
 	if (cms) free(cms);
 	return ret;
 }

tools/sm3speed.c

@@ -1,155 +0,0 @@
-/*
- *  Copyright 2014-2022 The GmSSL Project. All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the License); you may
- *  not use this file except in compliance with the License.
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <gmssl/sm3.h>
-#include <gmssl/hex.h>
-#include <gmssl/error.h>
-
-#ifdef WIN32
-#include <wincrypt.h>
-
-static volatile int finish;
-
-VOID CALLBACK TimerProc_sm3(HWND hwnd, UINT message, UINT iTimerID, DWORD dwTime)
-{
-	finish = 0;
-}
-
-int test_sm3()
-{
-	int sizebox[] = {16, 64, 256, 1024, 8192, 16384};
-	int countbox[6] = {0};
-	uint8_t **testhex;
-	HCRYPTPROV hCryptProv;
-
-	testhex = (uint8_t **)malloc(sizeof(uint8_t *) * 6);
-	for (int i = 0; i < 6; i++)
-	{
-		testhex[i] = (uint8_t *)malloc(sizebox[i]);
-		CryptGenRandom(hCryptProv, sizebox[i], testhex[i]);
-	}
-
-	uint8_t dgst[32];
-	int count;
-
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm3 for 3s on %d size blocks: ", sizebox[i]);
-		UINT_PTR iTimerID = SetTimer(NULL, 0, 3000, TimerProc_sm3);
-		while (finish)
-		{
-			sm3_digest(testhex[i], sizebox[i], dgst);
-			count++;
-		}
-		KillTimer(NULL, iTimerID);
-		countbox[i] = count;
-		printf("%d sm3's in 3s\n", count);
-	}
-	printf("type\t\t16 bytes\t64 bytes\t256 bytes\t1024 bytes\t8192 bytes\t16384 bytes\n");
-	printf("sm3\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-
-	for (int i = 0; i < 6; i++)
-	{
-		free(testhex[i]);
-	}
-	free(testhex);
-	return 1;
-}
-#else
-#include <signal.h>
-#include <sys/time.h>
-
-static volatile int finish;
-
-void sig_alm_handler_sm3(int sig_num)
-{
-	if (sig_num = SIGALRM)
-		finish = 0;
-}
-
-int test_sm3()
-{
-	int sizebox[] = {16, 64, 256, 1024, 8192, 16384};
-	int countbox[6] = {0};
-	uint8_t **testhex;
-
-	FILE *fs_p = fopen("/dev/urandom", "r");
-	if (NULL == fs_p)
-	{
-		printf("Can not open /dev/urandom\n");
-		return -1;
-	}
-
-	testhex = (uint8_t **)malloc(sizeof(uint8_t *) * 6);
-	for (int i = 0; i < 6; i++)
-	{
-		testhex[i] = (uint8_t *)malloc(sizebox[i]);
-		fread(testhex[i], sizebox[i], 1, fs_p);
-	}
-
-	fclose(fs_p);
-
-	uint8_t dgst[32];
-	int count;
-
-	signal(SIGALRM, sig_alm_handler_sm3);
-
-	struct itimerval new_value, old_value;
-	new_value.it_value.tv_sec = 3;
-	new_value.it_value.tv_usec = 0;
-	new_value.it_interval.tv_sec = 0;
-	new_value.it_interval.tv_usec = 0;
-
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm3 for 3s on %d size blocks: ", sizebox[i]);
-		setitimer(ITIMER_REAL, &new_value, &old_value);
-		while (finish)
-		{
-			sm3_digest(testhex[i], sizebox[i], dgst);
-			count++;
-		}
-		countbox[i] = count;
-		printf("%d sm3's in 3s\n", count);
-	}
-	printf("type\t\t16 bytes\t64 bytes\t256 bytes\t1024 bytes\t8192 bytes\t16384 bytes\n");
-	printf("sm3\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-
-	for (int i = 0; i < 6; i++)
-	{
-		free(testhex[i]);
-	}
-	free(testhex);
-	return 1;
-}
-#endif
-
-int sm3speed_main(void)
-{
-	test_sm3();
-	return 1;
-}

tools/sm4speed.c

@@ -1,360 +0,0 @@
-/*
- *  Copyright 2014-2022 The GmSSL Project. All Rights Reserved.
- *
- *  Licensed under the Apache License, Version 2.0 (the License); you may
- *  not use this file except in compliance with the License.
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <gmssl/hex.h>
-#include <gmssl/sm4.h>
-#include <gmssl/error.h>
-#include <gmssl/rand.h>
-
-#ifdef WIN32
-#include <wincrypt.h>
-
-static volatile int finish;
-
-VOID CALLBACK TimerProc_sm4(HWND hwnd, UINT message, UINT iTimerID, DWORD dwTime)
-{
-	finish = 0;
-}
-
-int test_sm4()
-{
-	uint8_t user_key[16] = {
-		0x01,
-		0x23,
-		0x45,
-		0x67,
-		0x89,
-		0xab,
-		0xcd,
-		0xef,
-		0xfe,
-		0xdc,
-		0xba,
-		0x98,
-		0x76,
-		0x54,
-		0x32,
-		0x10,
-	};
-	uint8_t iv[16] = {
-		0x01,
-		0x23,
-		0x45,
-		0x67,
-		0x89,
-		0xab,
-		0xcd,
-		0xef,
-		0xfe,
-		0xdc,
-		0xba,
-		0x98,
-		0x76,
-		0x54,
-		0x32,
-		0x10,
-	};
-	uint8_t ctr[16] = {0};
-	uint8_t mac[16] = {0};
-	uint8_t aad[16] = {
-		0x01,
-		0x23,
-		0x45,
-		0x67,
-		0x89,
-		0xab,
-		0xcd,
-		0xef,
-		0xfe,
-		0xdc,
-		0xba,
-		0x98,
-		0x76,
-		0x54,
-		0x32,
-		0x10,
-	};
-	uint8_t out[16384] = {0};
-
-	SM4_KEY key;
-	int sizebox[] = {16, 64, 256, 1024, 8192, 16384};
-	int countbox[18] = {0};
-	uint8_t *testhex[];
-	HCRYPTPROV hCryptProv;
-
-	testhex = (uint8_t **)malloc(sizeof(uint8_t *) * 6);
-	for (int i = 0; i < 6; i++)
-	{
-		testhex[i] = (uint8_t *)malloc(sizebox[i]);
-		CryptGenRandom(hCryptProv, sizebox[i], testhex[i]);
-	}
-
-	int count;
-
-	sm4_set_encrypt_key(&key, user_key);
-
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm4-cbc for 3s on %d size blocks: ", sizebox[i]);
-		UINT_PTR iTimerID = SetTimer(NULL, 0, 3000, TimerProc_sm4);
-		while (finish)
-		{
-			sm4_cbc_encrypt(&key, iv, testhex[i], sizebox[i] / 16, out);
-			count++;
-		}
-		KillTimer(NULL, iTimerID);
-		countbox[i] = count;
-		printf("%d sm4-cbc's in 3s\n", count);
-	}
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm4-ctr for 3s on %d size blocks: ", sizebox[i]);
-		UINT_PTR iTimerID = SetTimer(NULL, 0, 3000, TimerProc);
-		while (finish)
-		{
-			sm4_ctr_encrypt(&key, ctr, testhex[i], sizebox[i], out);
-			count++;
-		}
-		KillTimer(NULL, iTimerID);
-		countbox[i + 6] = count;
-		printf("%d sm4-ctr's in 3s\n", count);
-	}
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm4-gcm for 3s on %d size blocks: ", sizebox[i]);
-		UINT_PTR iTimerID = SetTimer(NULL, 0, 3000, TimerProc);
-		while (finish)
-		{
-			sm4_gcm_encrypt(&key, iv, 16, aad, 16, testhex[i], sizebox[i], out, 16, mac);
-			count++;
-		}
-		KillTimer(NULL, iTimerID);
-		countbox[i + 12] = count;
-		printf("%d sm4-gcm's in 3s\n", count);
-	}
-	printf("type\t\t16 bytes\t64 bytes\t256 bytes\t1024 bytes\t8192 bytes\t16384 bytes\n");
-	printf("sm4-cbc\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-	printf("sm4-ctr\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i + 6] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-	printf("sm4-gcm\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i + 12] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-
-	for (int i = 0; i < 6; i++)
-	{
-		free(testhex[i]);
-	}
-	free(testhex);
-	return 1;
-}
-
-#else
-#include <signal.h>
-#include <sys/time.h>
-
-static volatile int finish;
-
-void sig_alm_handler_sm4(int sig_num)
-{
-	if (sig_num = SIGALRM)
-		finish = 0;
-}
-
-int test_sm4()
-{
-	uint8_t user_key[16] = {
-		0x01,
-		0x23,
-		0x45,
-		0x67,
-		0x89,
-		0xab,
-		0xcd,
-		0xef,
-		0xfe,
-		0xdc,
-		0xba,
-		0x98,
-		0x76,
-		0x54,
-		0x32,
-		0x10,
-	};
-	uint8_t iv[16] = {
-		0x01,
-		0x23,
-		0x45,
-		0x67,
-		0x89,
-		0xab,
-		0xcd,
-		0xef,
-		0xfe,
-		0xdc,
-		0xba,
-		0x98,
-		0x76,
-		0x54,
-		0x32,
-		0x10,
-	};
-	uint8_t ctr[16] = {0};
-	uint8_t mac[16] = {0};
-	uint8_t aad[16] = {
-		0x01,
-		0x23,
-		0x45,
-		0x67,
-		0x89,
-		0xab,
-		0xcd,
-		0xef,
-		0xfe,
-		0xdc,
-		0xba,
-		0x98,
-		0x76,
-		0x54,
-		0x32,
-		0x10,
-	};
-	uint8_t out[16384] = {0};
-	int count;
-
-	SM4_KEY key;
-	int sizebox[] = {16, 64, 256, 1024, 8192, 16384};
-	int countbox[18] = {0};
-	uint8_t **testhex;
-
-	FILE *fs_p = fopen("/dev/urandom", "r");
-	if (NULL == fs_p)
-	{
-		printf("Can not open /dev/urandom\n");
-		return -1;
-	}
-
-	testhex = (uint8_t **)malloc(sizeof(uint8_t *) * 6);
-	for (int i = 0; i < 6; i++)
-	{
-		testhex[i] = (uint8_t *)malloc(sizebox[i]);
-		fread(testhex[i], sizebox[i], 1, fs_p);
-	}
-
-	fclose(fs_p);
-
-	signal(SIGALRM, sig_alm_handler_sm4);
-
-	struct itimerval new_value, old_value;
-	new_value.it_value.tv_sec = 3;
-	new_value.it_value.tv_usec = 0;
-	new_value.it_interval.tv_sec = 0;
-	new_value.it_interval.tv_usec = 0;
-
-	sm4_set_encrypt_key(&key, user_key);
-
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm4-cbc for 3s on %d size blocks: ", sizebox[i]);
-		setitimer(ITIMER_REAL, &new_value, &old_value);
-		while (finish)
-		{
-			sm4_cbc_encrypt(&key, iv, testhex[i], sizebox[i] / 16, out);
-			count++;
-		}
-
-		countbox[i] = count;
-		printf("%d sm4-cbc's in 3s\n", count);
-	}
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm4-ctr for 3s on %d size blocks: ", sizebox[i]);
-		setitimer(ITIMER_REAL, &new_value, &old_value);
-		while (finish)
-		{
-			sm4_ctr_encrypt(&key, ctr, testhex[i], sizebox[i], out);
-			count++;
-		}
-
-		countbox[i + 6] = count;
-		printf("%d sm4-ctr's in 3s\n", count);
-	}
-	for (int i = 0; i < 6; i++)
-	{
-		finish = 1;
-		count = 0;
-		printf("Doing sm4-gcm for 3s on %d size blocks: ", sizebox[i]);
-		setitimer(ITIMER_REAL, &new_value, &old_value);
-		while (finish)
-		{
-			sm4_gcm_encrypt(&key, iv, 16, aad, 16, testhex[i], sizebox[i], out, 16, mac);
-			count++;
-		}
-		countbox[i + 12] = count;
-		printf("%d sm4-gcm's in 3s\n", count);
-	}
-	printf("type\t\t16 bytes\t64 bytes\t256 bytes\t1024 bytes\t8192 bytes\t16384 bytes\n");
-	printf("sm4-cbc\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-	printf("sm4-ctr\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i + 6] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-	printf("sm4-gcm\t");
-	for (int i = 0; i < 6; i++)
-	{
-		printf("\t%.2fK", countbox[i + 12] * sizebox[i] / 1024 / 3.00);
-	}
-	printf("\n");
-
-	for (int i = 0; i < 6; i++)
-	{
-		free(testhex[i]);
-	}
-	free(testhex);
-	return 1;
-}
-
-#endif
-
-int sm4speed_main(void)
-{
-	test_sm4();
-	return 1;
-}