From 43a371caab80f7a3ce64edd3be951acc84270d18 Mon Sep 17 00:00:00 2001
From: PolarGoose <35307286+PolarGoose@users.noreply.github.com>
Date: Thu, 23 Apr 2026 11:08:49 +0200
Subject: [PATCH] [dsmr] Small refactoring: Move `Aes128GcmDecryptorImpl` type
 inside `esphome::dsmr` namespace. (#15940)

---
 esphome/components/dsmr/dsmr.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/esphome/components/dsmr/dsmr.h b/esphome/components/dsmr/dsmr.h
index c76a23fde4..626a389c1f 100644
--- a/esphome/components/dsmr/dsmr.h
+++ b/esphome/components/dsmr/dsmr.h
@@ -18,22 +18,27 @@
 
 #if __has_include(<psa/crypto.h>)
 #include <dsmr_parser/decryption/aes128gcm_tfpsa.h>
-using Aes128GcmDecryptorImpl = dsmr_parser::Aes128GcmTfPsa;
 #elif __has_include(<mbedtls/gcm.h>)
 #if __has_include(<mbedtls/esp_config.h>)
 #include <mbedtls/esp_config.h>
 #endif
 #include <dsmr_parser/decryption/aes128gcm_mbedtls.h>
-using Aes128GcmDecryptorImpl = dsmr_parser::Aes128GcmMbedTls;
 #elif __has_include(<bearssl/bearssl.h>)
 #include <dsmr_parser/decryption/aes128gcm_bearssl.h>
-using Aes128GcmDecryptorImpl = dsmr_parser::Aes128GcmBearSsl;
 #else
 #error "The platform doesn't provide a compatible encryption library for dsmr_parser"
 #endif
 
 namespace esphome::dsmr {
 
+#if __has_include(<psa/crypto.h>)
+using Aes128GcmDecryptorImpl = dsmr_parser::Aes128GcmTfPsa;
+#elif __has_include(<mbedtls/gcm.h>)
+using Aes128GcmDecryptorImpl = dsmr_parser::Aes128GcmMbedTls;
+#else
+using Aes128GcmDecryptorImpl = dsmr_parser::Aes128GcmBearSsl;
+#endif
+
 using namespace dsmr_parser::fields;
 
 #ifndef DSMR_SENSOR_LIST