From 469fe62166a1e382da8c6e4a348c2fe986de950f Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Wed, 24 Sep 2025 15:11:55 -0400
Subject: [PATCH] logger: cleanup crypto defines

---
 src/modules/logger/log_writer.h        |  3 ++-
 src/modules/logger/log_writer_file.cpp | 11 +++++++----
 src/modules/logger/log_writer_file.h   | 10 +++++++---
 src/modules/logger/logger.cpp          |  4 ++--
 src/modules/logger/logger.h            |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/modules/logger/log_writer.h b/src/modules/logger/log_writer.h
index 32fdea46df..a28132d6bd 100644
--- a/src/modules/logger/log_writer.h
+++ b/src/modules/logger/log_writer.h
@@ -173,7 +173,8 @@ public:
 	{
 		if (_log_writer_file) { _log_writer_file->set_encryption_parameters(algorithm, key_idx, exchange_key_idx); }
 	}
-#endif
+#endif // PX4_CRYPTO
+
 private:
 
 	LogWriterFile *_log_writer_file = nullptr;
diff --git a/src/modules/logger/log_writer_file.cpp b/src/modules/logger/log_writer_file.cpp
index 530076f49b..851bcec719 100644
--- a/src/modules/logger/log_writer_file.cpp
+++ b/src/modules/logger/log_writer_file.cpp
@@ -40,9 +40,12 @@
 
 #include <mathlib/mathlib.h>
 #include <px4_platform_common/posix.h>
-#include <px4_platform_common/crypto.h>
 #include <px4_platform_common/log.h>
 
+#if defined(PX4_CRYPTO)
+# include <px4_platform_common/crypto.h>
+#endif // PX4_CRYPTO
+
 #if defined(__PX4_NUTTX)
 # include <malloc.h>
 # include <systemlib/hardfault_log.h>
@@ -378,7 +381,7 @@ void LogWriterFile::run()
 #if defined(PX4_CRYPTO)
 				// Split into min blocksize chunks, so it is good for encrypting in pieces
 				available = (available / _min_blocksize) * _min_blocksize;
-#endif
+#endif // PX4_CRYPTO
 
 				/* if sufficient data available or partial read or terminating, write data */
 				if (available >= min_available[i] || is_part || (!buffer._should_run && available > 0)) {
@@ -408,7 +411,7 @@ void LogWriterFile::run()
 						}
 					}
 
-#endif
+#endif // PX4_CRYPTO
 
 					int written = buffer.write_to_file(read_ptr, available, call_fsync);
 
@@ -469,7 +472,7 @@ void LogWriterFile::run()
 				/* close the crypto session */
 
 				_crypto.close();
-#endif
+#endif // PX4_CRYPTO
 
 				break;
 			}
diff --git a/src/modules/logger/log_writer_file.h b/src/modules/logger/log_writer_file.h
index 4739b5b799..8b99e002d9 100644
--- a/src/modules/logger/log_writer_file.h
+++ b/src/modules/logger/log_writer_file.h
@@ -39,7 +39,10 @@
 #include <pthread.h>
 #include <drivers/drv_hrt.h>
 #include <perf/perf_counter.h>
-#include <px4_platform_common/crypto.h>
+
+#if defined(PX4_CRYPTO)
+# include <px4_platform_common/crypto.h>
+#endif // PX4_CRYPTO
 
 namespace px4
 {
@@ -143,7 +146,7 @@ public:
 		_key_idx = key_idx;
 		_exchange_key_idx = exchange_key_idx;
 	}
-#endif
+#endif // PX4_CRYPTO
 
 private:
 	static void *run_helper(void *);
@@ -223,6 +226,7 @@ private:
 	pthread_mutex_t		_mtx;
 	pthread_cond_t		_cv;
 	pthread_t _thread = 0;
+
 #if defined(PX4_CRYPTO)
 	bool init_logfile_encryption(const LogType type);
 	PX4Crypto _crypto;
@@ -230,7 +234,7 @@ private:
 	px4_crypto_algorithm_t _algorithm;
 	uint8_t _key_idx;
 	uint8_t _exchange_key_idx;
-#endif
+#endif // PX4_CRYPTO
 
 };
 
diff --git a/src/modules/logger/logger.cpp b/src/modules/logger/logger.cpp
index 00ffc2fbd2..f054cafaa2 100644
--- a/src/modules/logger/logger.cpp
+++ b/src/modules/logger/logger.cpp
@@ -1310,7 +1310,7 @@ int Logger::get_log_file_name(LogType type, char *file_name, size_t file_name_si
 		crypto_suffix = "e";
 	}
 
-#endif
+#endif // PX4_CRYPTO
 
 	char *log_file_name = _file_name[(int)type].log_file_name;
 
@@ -1419,7 +1419,7 @@ void Logger::start_log_file(LogType type)
 		(px4_crypto_algorithm_t)_param_sdlog_crypto_algorithm.get(),
 		_param_sdlog_crypto_key.get(),
 		_param_sdlog_crypto_exchange_key.get());
-#endif
+#endif // PX4_CRYPTO
 
 	if (_writer.start_log_file(type, file_name)) {
 		_writer.select_write_backend(LogWriter::BackendFile);
diff --git a/src/modules/logger/logger.h b/src/modules/logger/logger.h
index a24debd79e..673ee8756a 100644
--- a/src/modules/logger/logger.h
+++ b/src/modules/logger/logger.h
@@ -403,7 +403,7 @@ private:
 		, (ParamInt<px4::params::SDLOG_ALGORITHM>) _param_sdlog_crypto_algorithm,
 		(ParamInt<px4::params::SDLOG_KEY>) _param_sdlog_crypto_key,
 		(ParamInt<px4::params::SDLOG_EXCH_KEY>) _param_sdlog_crypto_exchange_key
-#endif
+#endif // PX4_CRYPTO
 	)
 };