Zephyr: More QoL changes for zephyr integration

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>

Author: sidcha

src/crypto/mbedtls.c

@@ -9,46 +9,56 @@
 #include <assert.h>
 
 #include <mbedtls/aes.h>
+
+#ifdef MBEDTLS_PSA_CRYPTO_C
+#include <psa/crypto.h>
+#else
 #include <mbedtls/entropy.h>
 #include <mbedtls/ctr_drbg.h>
+#endif
 
 #include <osdp.h>
 
-mbedtls_aes_context aes_ctx;
-mbedtls_entropy_context entropy_ctx;
-mbedtls_ctr_drbg_context ctr_drbg_ctx;
+static mbedtls_aes_context aes_ctx;
+
+#ifndef MBEDTLS_PSA_CRYPTO_C
+static mbedtls_entropy_context entropy_ctx;
+static mbedtls_ctr_drbg_context ctr_drbg_ctx;
+#endif
 
 void osdp_crypt_setup()
 {
+	mbedtls_aes_init(&aes_ctx);
+
+#ifdef MBEDTLS_PSA_CRYPTO_C
+	psa_status_t status = psa_crypto_init();
+	assert(status == PSA_SUCCESS);
+#else
 	int rc;
-	const char *version;
+	const char *version = osdp_get_version();
 
-	version = osdp_get_version();
-	mbedtls_aes_init(&aes_ctx);
 	mbedtls_entropy_init(&entropy_ctx);
 	mbedtls_ctr_drbg_init(&ctr_drbg_ctx);
-
 	rc = mbedtls_ctr_drbg_seed(&ctr_drbg_ctx,
 				   mbedtls_entropy_func,
 				   &entropy_ctx,
 				   (const unsigned char *)version,
 				   strlen(version));
 	assert(rc == 0);
+#endif
 }
 
 void osdp_encrypt(uint8_t *key, uint8_t *iv, uint8_t *data, int len)
 {
 	int rc;
 
 	if (iv != NULL) {
-		/* encrypt multiple block with AES in CBC mode */
 		rc = mbedtls_aes_setkey_enc(&aes_ctx, key, 128);
 		assert(rc == 0);
 		rc = mbedtls_aes_crypt_cbc(&aes_ctx, MBEDTLS_AES_ENCRYPT,
 					   len, iv, data, data);
 		assert(rc == 0);
 	} else {
-		/* encrypt one block with AES in ECB mode */
 		assert(len <= 16);
 		rc = mbedtls_aes_setkey_enc(&aes_ctx, key, 128);
 		assert(rc == 0);
@@ -63,14 +73,12 @@ void osdp_decrypt(uint8_t *key, uint8_t *iv, uint8_t *data, int len)
 	int rc;
 
 	if (iv != NULL) {
-		/* decrypt multiple block with AES in CBC mode */
 		rc = mbedtls_aes_setkey_dec(&aes_ctx, key, 128);
 		assert(rc == 0);
 		rc = mbedtls_aes_crypt_cbc(&aes_ctx, MBEDTLS_AES_DECRYPT,
 					   len, iv, data, data);
 		assert(rc == 0);
 	} else {
-		/* decrypt one block with AES in ECB mode */
 		assert(len <= 16);
 		rc = mbedtls_aes_setkey_dec(&aes_ctx, key, 128);
 		assert(rc == 0);
@@ -82,15 +90,20 @@ void osdp_decrypt(uint8_t *key, uint8_t *iv, uint8_t *data, int len)
 
 void osdp_fill_random(uint8_t *buf, int len)
 {
-	int rc;
-
-	rc = mbedtls_ctr_drbg_random(&ctr_drbg_ctx, buf, len);
+#ifdef MBEDTLS_PSA_CRYPTO_C
+	psa_status_t status = psa_generate_random(buf, len);
+	assert(status == PSA_SUCCESS);
+#else
+	int rc = mbedtls_ctr_drbg_random(&ctr_drbg_ctx, buf, len);
 	assert(rc == 0);
+#endif
 }
 
 void osdp_crypt_teardown()
 {
+#ifndef MBEDTLS_PSA_CRYPTO_C
 	mbedtls_ctr_drbg_free(&ctr_drbg_ctx);
 	mbedtls_entropy_free(&entropy_ctx);
+#endif
 	mbedtls_aes_free(&aes_ctx);
 }

utils

@@ -25,7 +25,6 @@ if (CONFIG_LIBOSDP)
 	target_include_directories(osdp INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 	zephyr_library_named(modules_osdp)
-	zephyr_library_compile_definitions(__BARE_METAL__)
 
 	# Pass all OSDP Kconfig values as compile definitions
 	zephyr_library_compile_definitions(OSDP_PACKET_BUF_SIZE=${CONFIG_OSDP_PACKET_BUF_SIZE})
@@ -45,10 +44,12 @@ if (CONFIG_LIBOSDP)
 	zephyr_library_compile_definitions(OSDP_CMD_ID_OFFSET=${CONFIG_OSDP_CMD_ID_OFFSET})
 	zephyr_library_compile_definitions(OSDP_PCAP_LINK_TYPE=${CONFIG_OSDP_PCAP_LINK_TYPE})
 	zephyr_library_compile_definitions(OSDP_PD_NAME_MAXLEN=${CONFIG_OSDP_PD_NAME_MAXLEN})
+	zephyr_library_compile_definitions(OSDP_CP_MAX_PDS=${CONFIG_OSDP_PD_MAX})
 
 	zephyr_library_link_libraries(osdp)
 	target_include_directories(modules_osdp PRIVATE ${OSDP_ROOT}/utils/include)
 
+	# Feature toggles
 	if (CONFIG_LIBOSDP_SKIP_MARK_BYTE)
 		zephyr_library_compile_definitions(OPT_OSDP_SKIP_MARK_BYTE=1)
 	endif()
@@ -61,6 +62,23 @@ if (CONFIG_LIBOSDP)
 		zephyr_library_compile_definitions(OPT_DISABLE_PRETTY_LOGGING=1)
 	endif()
 
+	if (CONFIG_LIBOSDP_STATIC)
+		zephyr_library_compile_definitions(OPT_OSDP_STATIC=1)
+	endif()
+
+	if (CONFIG_LIBOSDP_LOG_MINIMAL)
+		zephyr_library_compile_definitions(OPT_OSDP_LOG_MINIMAL=1)
+	endif()
+
+	if (CONFIG_LIBOSDP_PACKET_TRACE)
+		zephyr_library_compile_definitions(OPT_OSDP_PACKET_TRACE=1)
+	endif()
+
+	if (CONFIG_LIBOSDP_DATA_TRACE)
+		zephyr_library_compile_definitions(OPT_OSDP_DATA_TRACE=1)
+	endif()
+
+	# Core sources
 	zephyr_library_sources(
 		## LibOSDP
 		${OSDP_ROOT}/src/osdp_cp.c
@@ -72,17 +90,29 @@ if (CONFIG_LIBOSDP)
 		${OSDP_ROOT}/src/osdp_metrics.c
 
 		## Utils
-		## TODO: Migrate these to use (or wrap around) zephyr API
 		${OSDP_ROOT}/utils/src/list.c
 		${OSDP_ROOT}/utils/src/queue.c
 		${OSDP_ROOT}/utils/src/utils.c
-		${OSDP_ROOT}/utils/src/logger.c
 		${OSDP_ROOT}/utils/src/disjoint_set.c
 
 		## Zephyr glue code
 		src/osdp.c
 	)
 
+	# Logger: full or minimal
+	if (NOT CONFIG_LIBOSDP_LOG_MINIMAL)
+		zephyr_library_sources(${OSDP_ROOT}/utils/src/logger.c)
+	endif()
+
+	# Diagnostics (packet/data trace → PCAP capture)
+	if (CONFIG_LIBOSDP_PACKET_TRACE OR CONFIG_LIBOSDP_DATA_TRACE)
+		zephyr_library_sources(
+			${OSDP_ROOT}/src/osdp_diag.c
+			${OSDP_ROOT}/utils/src/pcap_gen.c
+		)
+	endif()
+
+	# Crypto backend
 	if (CONFIG_LIBOSDP_CRYPTO_MBEDTLS)
 		zephyr_library_compile_definitions(OPT_OSDP_USE_MBEDTLS)
 		zephyr_library_sources(${OSDP_ROOT}/src/crypto/mbedtls.c)

zephyr/CMakeLists.txt

@@ -26,6 +26,14 @@ config LIBOSDP_CRYPTO_TINYAES
 
 endchoice
 
+config LIBOSDP_STATIC
+	bool "Static allocation (no malloc/free)"
+	default y
+	help
+		Allocate all LibOSDP internal structures statically.
+		PD arrays are sized to OSDP_PD_MAX. This eliminates
+		all dynamic memory allocation inside LibOSDP.
+
 config LIBOSDP_RX_ZERO_COPY
 	bool "Enable zero-copy RX buffers"
 	default y
@@ -43,10 +51,32 @@ config LIBOSDP_SKIP_MARK_BYTE
 	bool "Don't send the leading mark byte (0xFF)"
 	default n
 
+config LIBOSDP_LOG_MINIMAL
+	bool "Minimal logging (reduced RAM/stack)"
+	default n
+	help
+		Use a lightweight logger that omits timestamps and
+		file/line information. Saves RAM and stack space
+		on constrained targets.
+
 config LIBOSDP_DISABLE_PRETTY_LOGGING
 	bool "Don't colorize log outputs"
 	default n
 
+config LIBOSDP_PACKET_TRACE
+	bool "Enable OSDP packet trace (PCAP)"
+	default n
+	help
+		Record raw OSDP packets for diagnostics. Enables
+		PCAP capture support via osdp_diag.
+
+config LIBOSDP_DATA_TRACE
+	bool "Enable OSDP data buffer trace"
+	default n
+	help
+		Trace command/reply data buffers for diagnostics.
+		Enables PCAP capture support via osdp_diag.
+
 config OSDP_UART_BAUD_RATE
 	int "OSDP UART baud rate"
 	default 115200

zephyr/Kconfig

@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <stdint.h>
 #include <zephyr/kernel.h>
 
-int64_t osdp_millis_now(void)
+#include <utils/utils.h>
+
+tick_t osdp_millis_now(void)
 {
-	return (int64_t) k_uptime_get();
+	return (tick_t)k_uptime_get();
 }