Code cleanup for SecurityModeCommand

src/nas/common/Ie_Const.hpp

@@ -98,6 +98,7 @@ constexpr uint8_t kIeiReleaseAssistanceIndication = 0x0F;  // F-(4 higher bits)
 
 constexpr uint8_t kIei5gmmCapability              = 0x10;
 constexpr uint8_t kIeiUeUsageSetting              = 0x18;
+constexpr uint8_t kIeiS1UeSecurityCapability      = 0x19;
 constexpr uint8_t kIeiAuthenticationParameterAutn = 0x20;
 constexpr uint8_t kIeiAuthenticationParameterRand = 0x21;
 constexpr uint8_t kIei5gsNetworkFeatureSupport    = 0x21;

src/nas/msgs/SecurityModeCommand.hpp

@@ -42,10 +42,10 @@ class SecurityModeCommand : public NasMmPlainHeader {
   void SetNgKsi(uint8_t tsc, uint8_t key_set_id);
   // TODO: Get
 
-  void SetUeSecurityCapability(uint8_t g_EASel, uint8_t g_IASel);
+  void SetUeSecurityCapability(uint8_t ea, uint8_t ia);
   // TODO: Get
   void SetUeSecurityCapability(
-      uint8_t g_EASel, uint8_t g_IASel, uint8_t eea, uint8_t eia);
+      uint8_t ea, uint8_t ia, uint8_t eea, uint8_t eia);
   // TODO: Get
 
   void SetImeisvRequest(uint8_t value);
@@ -63,19 +63,19 @@ class SecurityModeCommand : public NasMmPlainHeader {
   void SetAbba(uint8_t length, uint8_t* value);
   // TODO: Get
 
-  void SetS1UeSecurityCapability(uint8_t g_EEASel, uint8_t g_EIASel);
+  void SetS1UeSecurityCapability(uint8_t eea, uint8_t eia);
   // TODO: Get
 
  public:
   NasSecurityAlgorithms ie_selected_nas_security_algorithms;  // Mandatory
-  NasKeySetIdentifier ie_ngKSI;                               // Mandatory
+  NasKeySetIdentifier ie_ng_ksi;                              // Mandatory
   UESecurityCapability ie_ue_security_capability;             // Mandatory
 
   std::optional<ImeisvRequest> ie_imeisv_request;  // Optional
   std::optional<EpsNasSecurityAlgorithms>
       ie_eps_nas_security_algorithms;  // Optional
   std::optional<Additional5gSecurityInformation>
-      ie_additional_5G_security_information;  // Optional
+      ie_additional_5g_security_information;  // Optional
   std::optional<EapMessage> ie_eap_message;   // Optional
   std::optional<ABBA> ie_abba;                // Optional
   std::optional<S1UeSecurityCapability>