Merge pull request #309 from aligungr/dev

Release v3.1.8
aligungr · May 1, 2021 · 7d5fe2d · 7d5fe2d
2 parents fa98105 + 1d85281
commit 7d5fe2d
Show file tree

Hide file tree

Showing 25 changed files with 555 additions and 187 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
   <a href="https://github.com/aligungr/UERANSIM"><img src="/.github/logo.png" width="75" title="UERANSIM"></a>
 </p>
 <p align="center">
-<img src="https://img.shields.io/badge/UERANSIM-v3.1.7-blue" />
+<img src="https://img.shields.io/badge/UERANSIM-v3.1.8-blue" />
 <img src="https://img.shields.io/badge/3GPP-R15-orange" />
 <img src="https://img.shields.io/badge/License-GPL--3.0-green"/>
 </p>

diff --git a/src/lib/crypt/milenage.cpp b/src/lib/crypt/milenage.cpp
@@ -27,10 +27,10 @@ Milenage Calculate(const OctetString &opc, const OctetString &key, const OctetSt
     r.ak_r = OctetString::FromSpare(6);
 
     if (milenage_f1(opc.data(), key.data(), rand.data(), sqn.data(), amf.data(), r.mac_a.data(), r.mac_s.data()))
-        throw std::runtime_error("OPC calculation failed");
+        throw std::runtime_error("Milenage calculation failed");
     if (milenage_f2345(opc.data(), key.data(), rand.data(), r.res.data(), r.ck.data(), r.ik.data(), r.ak.data(),
                        r.ak_r.data()))
-        throw std::runtime_error("OPC calculation failed");
+        throw std::runtime_error("Milenage calculation failed");
 
     return r;
 }

diff --git a/src/lib/nas/msg.hpp b/src/lib/nas/msg.hpp
@@ -556,6 +556,7 @@ struct SecurityModeCommand : PlainMmMessage
     std::optional<IES1UeNetworkCapability> replayedS1UeNetworkCapability{};
 
     octet4 _macForNewSC{};
+    OctetString _originalPlainNasPdu{};
 
     SecurityModeCommand();
     void onBuild(NasMessageBuilder &b);

diff --git a/src/ue/nas/keys.cpp b/src/ue/nas/keys.cpp
@@ -81,7 +81,6 @@ std::pair<OctetString, OctetString> CalculateCkPrimeIkPrime(const OctetString &c
     s[1] = sqnXorAk.copy();
 
     auto res = crypto::CalculateKdfKey(key, 0x20, s, 2);
-    ;
 
     std::pair<OctetString, OctetString> ckIk;
     ckIk.first = res.subCopy(0, ck.length());
@@ -139,4 +138,20 @@ OctetString CalculateResStar(const OctetString &key, const std::string &snn, con
     return output.subCopy(output.length() - 16);
 }
 
+OctetString DeriveAmfPrimeInMobility(bool isUplink, const NasCount &count, const OctetString &kAmf)
+{
+    OctetString params[2];
+    params[0] = OctetString::FromOctet(isUplink ? 0x00 : 0x01);
+    params[1] = OctetString::FromOctet4(count.toOctet4());
+
+    return crypto::CalculateKdfKey(kAmf, 0x72, params, 2);
+}
+
+OctetString CalculateAuts(const OctetString &sqn, const OctetString &ak, const OctetString &macS)
+{
+    OctetString auts = OctetString::Xor(sqn, ak);
+    auts.append(macS);
+    return auts;
+}
+
 } // namespace nr::ue::keys
diff --git a/src/ue/nas/keys.hpp b/src/ue/nas/keys.hpp
@@ -28,6 +28,11 @@ void DeriveNasKeys(NasSecurityContext &securityContext);
  */
 std::string ConstructServingNetworkName(const Plmn &plmn);
 
+/**
+ * Derives kAMF to kAMF' in mobility 33.501/A.13
+ */
+OctetString DeriveAmfPrimeInMobility(bool isUplink, const NasCount &count, const OctetString &kAmf);
+
 /**
  * Calculates K_AUSF for 5G-AKA according to given parameters as specified in 3GPP TS 33.501 Annex A.2
  */
@@ -66,4 +71,9 @@ OctetString CalculateKAusfForEapAkaPrime(const OctetString &mk);
 OctetString CalculateResStar(const OctetString &key, const std::string &snn, const OctetString &rand,
                              const OctetString &res);
 
-} // namespace nr::ue::keys
+/*
+ * Calculates AUTS according to the given parameters
+ */
+OctetString CalculateAuts(const OctetString &sqn, const OctetString &ak, const OctetString &macS);
+
+} // namespace nr::ue::keys