Protection of initial NAS messages

src/ue/nas/mm/transport.cpp

@@ -13,6 +13,9 @@
 #include <ue/nas/sm/sm.hpp>
 #include <ue/rrc/task.hpp>
 
+// See https://github.com/aligungr/UERANSIM/issues/316 for details about this behaviour.
+#define NAS_CONTAINER_NOT_CIPHERED 1
+
 namespace nr::ue
 {
 
@@ -125,9 +128,14 @@ void NasMm::sendNasMessage(const nas::PlainMmMessage &msg)
         {
             if (HasNonCleartext(msg))
             {
-                auto originalSecured = nas_enc::Encrypt(*m_usim->m_currentNsCtx, msg, false);
                 OctetString originalPdu;
+
+#if NAS_CONTAINER_NOT_CIPHERED
+                nas::EncodeNasMessage(msg, originalPdu);
+#else
+                auto originalSecured = nas_enc::Encrypt(*m_usim->m_currentNsCtx, msg, false);
                 nas::EncodeNasMessage(*originalSecured, originalPdu);
+#endif
 
                 auto copy = nas::utils::DeepCopyMsg(msg);
                 RemoveCleartextIEs((nas::PlainMmMessage &)*copy, std::move(originalPdu));