sec: rename security engine impl

Author: robertfalkenberg

lib/pdcp/pdcp_entity_tx.cpp

@@ -9,7 +9,7 @@
  */
 
 #include "pdcp_entity_tx.h"
-#include "../security/security_engine_generic.h"
+#include "../security/security_engine_impl.h"
 #include "../support/sdu_window_impl.h"
 #include "srsran/instrumentation/traces/up_traces.h"
 #include "srsran/support/bit_encoding.h"
@@ -358,7 +358,7 @@ void pdcp_entity_tx::configure_security(security::sec_128_as_config sec_cfg,
 
   auto direction = cfg.direction == pdcp_security_direction::uplink ? security::security_direction::uplink
                                                                     : security::security_direction::downlink;
-  sec_engine     = std::make_unique<security::security_engine_generic>(
+  sec_engine     = std::make_unique<security::security_engine_impl>(
       sec_cfg, bearer_id, direction, integrity_enabled, ciphering_enabled);
 
   logger.log_info("Security configured: NIA{} ({}) NEA{} ({}) domain={}",

lib/security/CMakeLists.txt

@@ -12,7 +12,7 @@ set(SOURCES
   ciphering_engine_nea2.cpp
   integrity_engine_generic.cpp
   security.cpp
-  security_engine_generic.cpp
+  security_engine_impl.cpp
   s3g.cpp
   zuc.cpp
 )

lib/security/security_engine_generic.cpp renamed to lib/security/security_engine_impl.cpp

@@ -10,19 +10,19 @@
  *
  */
 
-#include "security_engine_generic.h"
+#include "security_engine_impl.h"
 #include "ciphering_engine_generic.h"
 #include "ciphering_engine_nea2.h"
 #include "integrity_engine_generic.h"
 
 using namespace srsran;
 using namespace security;
 
-security_engine_generic::security_engine_generic(security::sec_128_as_config sec_cfg,
-                                                 uint8_t                     bearer_id,
-                                                 security_direction          direction,
-                                                 security::integrity_enabled integrity_enabled,
-                                                 security::ciphering_enabled ciphering_enabled)
+security_engine_impl::security_engine_impl(security::sec_128_as_config sec_cfg,
+                                           uint8_t                     bearer_id,
+                                           security_direction          direction,
+                                           security::integrity_enabled integrity_enabled,
+                                           security::ciphering_enabled ciphering_enabled)
 {
   if (integrity_enabled == security::integrity_enabled::on) {
     if (sec_cfg.integ_algo.has_value() && sec_cfg.k_128_int.has_value()) {
@@ -43,7 +43,7 @@ security_engine_generic::security_engine_generic(security::sec_128_as_config sec
   }
 }
 
-security_result security_engine_generic::encrypt_and_protect_integrity(byte_buffer buf, size_t offset, uint32_t count)
+security_result security_engine_impl::encrypt_and_protect_integrity(byte_buffer buf, size_t offset, uint32_t count)
 {
   security_result result{.buf = std::move(buf), .count = count};
 
@@ -63,7 +63,7 @@ security_result security_engine_generic::encrypt_and_protect_integrity(byte_buff
   return result;
 }
 
-security_result security_engine_generic::decrypt_and_verify_integrity(byte_buffer buf, size_t offset, uint32_t count)
+security_result security_engine_impl::decrypt_and_verify_integrity(byte_buffer buf, size_t offset, uint32_t count)
 {
   security_result result;
   return result;

lib/security/security_engine_generic.h renamed to lib/security/security_engine_impl.h

@@ -20,15 +20,15 @@
 namespace srsran {
 namespace security {
 
-class security_engine_generic : public security_engine
+class security_engine_impl final : public security_engine
 {
 public:
-  security_engine_generic(sec_128_as_config  sec_cfg,
-                          uint8_t            bearer_id,
-                          security_direction direction,
-                          integrity_enabled  integrity_enabled,
-                          ciphering_enabled  ciphering_enabled);
-  ~security_engine_generic() = default;
+  security_engine_impl(sec_128_as_config  sec_cfg,
+                       uint8_t            bearer_id,
+                       security_direction direction,
+                       integrity_enabled  integrity_enabled,
+                       ciphering_enabled  ciphering_enabled);
+  ~security_engine_impl() = default;
 
   security_result encrypt_and_protect_integrity(byte_buffer buf, size_t offset, uint32_t count) override;
   security_result decrypt_and_verify_integrity(byte_buffer buf, size_t offset, uint32_t count) override;