Memory alignment

AUTHORS.md

@@ -45,6 +45,7 @@ Contributors*
   - license issues
   - bign/params
   - code review
+  - memory alignment
 - Alexander Zhirkevich
   - cmd/sig, cmd/rng, cmd/test
 - Vladimir Komisarenko

CMakeLists.txt

@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.5...3.31)
-project(BEE2 C)
+project(BEE2
+  VERSION 2.1.9
+  LANGUAGES C
+)
 
-set(BEE2_VERSION_MAJOR "2")
-set(BEE2_VERSION_MINOR "1")
-set(BEE2_VERSION_PATCH "8")
-set(BEE2_VERSION 
-  "${BEE2_VERSION_MAJOR}.${BEE2_VERSION_MINOR}.${BEE2_VERSION_PATCH}")
+include(GNUInstallDirs)
 
 # \remark Set BUILD_PIC even for static libraries if they are linked 
 # into shared libraries
@@ -115,17 +114,19 @@ if(CMAKE_COMPILER_IS_CLANG)
     -fno-strict-aliasing")
   set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g3")
   set(CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_COVERAGE} -O0 -g3 -coverage")
-  set(CMAKE_C_FLAGS_ASAN "${CMAKE_C_FLAGS_ASAN} -fsanitize=address \
-    -fno-common -fsanitize=undefined -fno-sanitize-recover -O3 \
-    -fno-strict-aliasing")
-  set(CMAKE_C_FLAGS_ASANDBG "${CMAKE_C_FLAGS_ASANDBG} -fsanitize=address \
-    -fno-common -fsanitize=undefined -fno-sanitize-recover -O1 -g3 \
-    -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+  set(CMAKE_C_FLAGS_ASAN "${CMAKE_C_FLAGS_ASAN} -fsanitize=address,undefined\
+    -fno-sanitize=signed-integer-overflow  -fno-sanitize=unsigned-integer-overflow\
+    -fno-sanitize-recover\
+    -fno-common -O3 -fno-strict-aliasing")
+  set(CMAKE_C_FLAGS_ASANDBG "${CMAKE_C_FLAGS_ASANDBG} -fsanitize=address,udefined \
+    -fno-sanitize=signed-integer-overflow  -fno-sanitize=unsigned-integer-overflow\
+    -fno-sanitize-recover\
+    -fno-common -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
   set(CMAKE_C_FLAGS_MEMSAN "${CMAKE_C_FLAGS_MEMSAN} -fsanitize=memory -O3 \
     -fno-strict-aliasing")
   set(CMAKE_C_FLAGS_MEMSANDBG "${CMAKE_C_FLAGS_MEMSANDBG} -fsanitize=memory \
-    -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls \
-    -fsanitize-memory-track-origins=2")
+    -fsanitize-memory-track-origins=2\ 
+    -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls")
   set(CMAKE_C_FLAGS_CHECK "${CMAKE_C_FLAGS_CHECK} -Werror -O1 -Wcast-qual")
 endif(CMAKE_COMPILER_IS_CLANG)
 
@@ -145,14 +146,6 @@ if(BUILD_FAST)
   add_definitions(-DSAFE_FAST)
 endif()
 
-if(NOT LIB_INSTALL_DIR)
-  set(LIB_INSTALL_DIR lib)
-endif()
-
-if(NOT BIN_INSTALL_DIR)
-  set(BIN_INSTALL_DIR bin)
-endif()
-
 include_directories(include)
 include_directories(src)
 

README.md

@@ -38,7 +38,6 @@ Russia and Ukraine.
 mkdir build
 cd build
 cmake [-DCMAKE_BUILD_TYPE={Release|Debug|Coverage|ASan|ASanDbg|MemSan|MemSanDbg|Check}]\
-      [-DBUILD_FAST=ON]\
       [-DBASH_PLATFORM={BASH_32|BASH_64|BASH_AVX2|BASH_AVX512|BASH_NEON}]\
       ..
 make
@@ -53,7 +52,6 @@ compiler:
 > mkdir build
 > cd build
 > cmake [-DCMAKE_BUILD_TYPE={Release|Debug|Coverage|ASan|ASanDbg|MemSan|MemSanDbg|Check}]\
->       [-DBUILD_FAST=ON]\
 >       [-DBASH_PLATFORM={BASH_32|BASH_64|BASH_AVX2|BASH_AVX512|BASH_NEON}]\
 >       -G "MinGW Makefiles"\
 >       ..
@@ -69,9 +67,6 @@ Build types (`Release` by default):
 *  `MemSan`, `MemSanDbg` — [memory sanitizer](http://code.google.com/p/memory-sanitizer/);
 *  `Check` — strict compile rules.
 
-The `BUILD_FAST` option (`OFF` by default) switches from safe (constant-time) 
-functions to fast (non-constant-time) ones.
-
 The `BASH_PLATFORM` option (`BASH_64` by default) requests to use a specific
 implementation of the STB 34.101.77 algorithms optimized for a given hardware
 platform. The request may be rejected if it conflicts with other options.

cmd/CMakeLists.txt

@@ -19,6 +19,7 @@ add_executable(bee2cmd
   cvc/cvc.c
   cvr/cvr.c
   es/es.c
+  fmt/fmt.c
   kg/kg.c
   pwd/pwd.c
   sig/sig.c
@@ -33,7 +34,7 @@ include_directories(include)
 target_link_libraries(bee2cmd bee2_static)
 
 install(TARGETS bee2cmd
-  DESTINATION ${BIN_INSTALL_DIR}
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE 
     WORLD_READ WORLD_EXECUTE
 ) 

cmd/cmd_main.c

@@ -4,7 +4,7 @@
 \brief Command-line interface to Bee2: main
 \project bee2/cmd
 \created 2022.06.07
-\version 2025.06.09
+\version 2025.09.22
 \copyright The Bee2 authors
 \license Licensed under the Apache License, Version 2.0 (see LICENSE.txt).
 *******************************************************************************
@@ -93,6 +93,7 @@ extern err_t cvcInit();
 extern err_t cvrInit();
 extern err_t sigInit();
 extern err_t csrInit();
+extern err_t fmtInit();
 extern err_t stampInit();
 extern err_t esInit();
 extern err_t stInit();
@@ -117,6 +118,8 @@ static err_t cmdInit()
 	ERR_CALL_CHECK(code);
 	code = csrInit();
 	ERR_CALL_CHECK(code);
+	code = fmtInit();
+	ERR_CALL_CHECK(code);
 	code = stampInit();
 	ERR_CALL_CHECK(code);
 	code = esInit();
@@ -200,7 +203,7 @@ int main(int argc, char* argv[])
 	// обработка команды
 	for (pos = 0; pos < _count; ++pos)
 		if (strEq(argv[1], _cmds[pos].name))
-			return _cmds[pos].fn(argc - 1,  argv + 1);
+			return _cmds[pos].fn(argc - 1, argv + 1);
 	printf("bee2cmd: %s\n", errMsg(ERR_CMD_NOT_FOUND));
 	return -1;
 }

cmd/core/cmd_arg.c

@@ -4,7 +4,7 @@
 \brief Command-line interface to Bee2: parsing arguments
 \project bee2/cmd 
 \created 2022.06.08
-\version 2025.06.10
+\version 2025.09.01
 \copyright The Bee2 authors
 \license Licensed under the Apache License, Version 2.0 (see LICENSE.txt).
 *******************************************************************************
@@ -127,10 +127,13 @@ err_t cmdArgCreate(int* argc, char*** argv, const char* args)
 		*argc += 1, count += c, size += s;
 	}
 	// выделить и разметить память
-	if (!(state = blobCreate(*argc * sizeof(char*) + size)))
+	state = blobCreate2( 
+		(size_t)*argc * sizeof(char*),
+		size,
+		SIZE_MAX,
+		argv, &strs);
+	if (state == 0)
 		return ERR_OUTOFMEMORY;
-	*argv = (char**)state;
-	strs = (char*)(*argv + *argc);
 	// разобрать аргументы
 	for (size = 0, pos = 0, count = argWsDec(args); args[count] != '\0';)
 	{

cmd/core/cmd_cvc.c

@@ -4,7 +4,7 @@
 \brief Command-line interface to Bee2: managing CV-certificates
 \project bee2/cmd
 \created 2022.08.20
-\version 2025.06.09
+\version 2025.09.22
 \copyright The Bee2 authors
 \license Licensed under the Apache License, Version 2.0 (see LICENSE.txt).
 *******************************************************************************
@@ -227,14 +227,16 @@ err_t cmdCVCsFind(size_t* offset, const octet* certs, size_t certs_len,
 err_t cmdCVCsCheck(const octet* certs, size_t certs_len)
 {
 	err_t code;
-	void* stack;
-	btok_cvc_t* cvc;
+	void* state;
+	btok_cvc_t* cvc;		/* [1] */
 	// pre
 	ASSERT(memIsValid(certs, certs_len));
 	// выделить и разметить память
-	code = cmdBlobCreate(stack, sizeof(btok_cvc_t));
+	code = cmdBlobCreate2(state, 
+		sizeof(btok_cvc_t),
+		SIZE_MAX,
+		&cvc);
 	ERR_CALL_CHECK(code);
-	cvc = (btok_cvc_t*)stack;
 	// цикл по сертификатам
 	while (certs_len)
 	{
@@ -244,40 +246,42 @@ err_t cmdCVCsCheck(const octet* certs, size_t certs_len)
 			code = ERR_BAD_CERTRING;
 		else
 			code = btokCVCUnwrap(cvc, certs, len, 0, 0);
-		ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+		ERR_CALL_HANDLE(code, cmdBlobClose(state));
 		// к следующему
 		certs += len, certs_len -= len;
 	}
 	// завершить
-	cmdBlobClose(stack);
+	cmdBlobClose(state);
 	return code;
 }
 
 err_t cmdCVCsVal(const octet* certs, size_t certs_len, const octet date[6])
 {
 	err_t code;
-	void* stack;
 	size_t len;
-	btok_cvc_t* cvca;
-	btok_cvc_t* cvc;
+	void* state;	
+	btok_cvc_t* cvca;			/* [1] */
+	btok_cvc_t* cvc;			/* [1] */
 	// pre
 	ASSERT(memIsValid(certs, certs_len));
 	ASSERT(memIsNullOrValid(date, 6));
 	// пустая цепочка?
 	if (!certs_len)
 		return ERR_OK;
 	// выделить и разметить память
-	code = cmdBlobCreate(stack, 2 * sizeof(btok_cvc_t));
+	code = cmdBlobCreate2(state, 
+		sizeof(btok_cvc_t), 
+		sizeof(btok_cvc_t), 
+		SIZE_MAX,
+		&cvca, &cvc);
 	ERR_CALL_CHECK(code);
-	cvca = (btok_cvc_t*)stack;
-	cvc = cvca + 1;
 	// найти и разобрать первый сертификат
 	len = btokCVCLen(certs, certs_len);
 	if (len == SIZE_MAX)
 		code = ERR_BAD_CERT;
-	ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+	ERR_CALL_HANDLE(code, cmdBlobClose(state));
 	code = btokCVCUnwrap(cvca, certs, len, 0, 0);
-	ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+	ERR_CALL_HANDLE(code, cmdBlobClose(state));
 	certs_len -= len, certs += len;
 	// цикл по остальным сертификатам
 	while (certs_len)
@@ -286,34 +290,36 @@ err_t cmdCVCsVal(const octet* certs, size_t certs_len, const octet date[6])
 		len = btokCVCLen(certs, certs_len);
 		if (len == SIZE_MAX)
 			code = ERR_BAD_CERT;
-		ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+		ERR_CALL_HANDLE(code, cmdBlobClose(state));
 		// проверить сертификат
 		if (len == certs_len && date && !memIsZero(date, 6))
 			code = btokCVCVal2(cvc, certs, len, cvca, date);
 		else
 			code = btokCVCVal2(cvc, certs, len, cvca, 0);
-		ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+		ERR_CALL_HANDLE(code, cmdBlobClose(state));
 		// к следующему сертификату
 		certs_len -= len, certs += len;
 		// издатель <- эмитент
 		memCopy(cvca, cvc, sizeof(btok_cvc_t));
 	}
 	// завершить
-	cmdBlobClose(stack);
+	cmdBlobClose(state);
 	return code;
 }
 
 err_t cmdCVCsPrint(const octet* certs, size_t certs_len)
 {
 	err_t code;
-	void* stack;
-	btok_cvc_t* cvc;
+	void* state;
+	btok_cvc_t* cvc;		/* [1] */
 	// pre
 	ASSERT(memIsValid(certs, certs_len));
 	// выделить и разметить память
-	code = cmdBlobCreate(stack, sizeof(btok_cvc_t));
+	code = cmdBlobCreate2(state, 
+		sizeof(btok_cvc_t),
+		SIZE_MAX,
+		&cvc);
 	ERR_CALL_CHECK(code);
-	cvc = (btok_cvc_t*)stack;
 	// цикл по сертификатам
 	while (certs_len)
 	{
@@ -323,20 +329,20 @@ err_t cmdCVCsPrint(const octet* certs, size_t certs_len)
 			code = ERR_BAD_CERTRING;
 		else
 			code = btokCVCUnwrap(cvc, certs, len, 0, 0);
-		ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+		ERR_CALL_HANDLE(code, cmdBlobClose(state));
 		// печатать
 		printf("  %s (%u bits, issued by %s, ",
 			cvc->holder, (unsigned)cvc->pubkey_len * 2, cvc->authority);
 		code = cmdPrintDate(cvc->from);
-		ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+		ERR_CALL_HANDLE(code, cmdBlobClose(state));
 		printf("-");
 		code = cmdPrintDate(cvc->until);
-		ERR_CALL_HANDLE(code, cmdBlobClose(stack));
+		ERR_CALL_HANDLE(code, cmdBlobClose(state));
 		printf(")\n");
 		// к следующему
 		certs += len, certs_len -= len;
 	}
 	// завершить
-	cmdBlobClose(stack);
+	cmdBlobClose(state);
 	return code;
 }