EAP AKA' bug fix

src/lib/nas/eap.cpp

@@ -13,32 +13,60 @@
 
 OctetString eap::EapAttributes::getRand() const
 {
-    return attributes[(int)EAttributeType::AT_RAND].value().subCopy(2);
+    auto &val = attributes[(int)EAttributeType::AT_RAND];
+    if (!val.has_value() || val->length() < 2)
+        return {};
+
+    int len = val->get2I(0);
+    if (len != val->length() - 2)
+        return {};
+
+    return val->subCopy(2);
 }
 
 OctetString eap::EapAttributes::getMac() const
 {
-    return attributes[(int)EAttributeType::AT_MAC].value().subCopy(2);
+    auto &val = attributes[(int)EAttributeType::AT_MAC];
+    if (!val.has_value() || val->length() < 2)
+        return {};
+
+    int len = val->get2I(0);
+    if (len != val->length() - 2)
+        return {};
+
+    return val->subCopy(2);
 }
 
 OctetString eap::EapAttributes::getAutn() const
 {
-    return attributes[(int)EAttributeType::AT_AUTN].value().subCopy(2);
+    auto &val = attributes[(int)EAttributeType::AT_AUTN];
+    if (!val.has_value() || val->length() < 2)
+        return {};
+
+    int len = val->get2I(0);
+    if (len != val->length() - 2)
+        return {};
+
+    return val->subCopy(2);
 }
 
 int eap::EapAttributes::getClientErrorCode() const
 {
-    return attributes[(int)EAttributeType::AT_CLIENT_ERROR_CODE].value().get2I(0);
+    auto &val = attributes[(int)EAttributeType::AT_CLIENT_ERROR_CODE];
+    if (!val.has_value() || val->length() != 2)
+        return 0;
+    return val->get2I(0);
 }
 
 int eap::EapAttributes::getKdf() const
 {
-    return attributes[(int)EAttributeType::AT_KDF].value().get2I(0);
-}
+    auto &val = attributes[(int)EAttributeType::AT_KDF];
 
-const OctetString &eap::EapAttributes::getAuts() const
-{
-    return attributes[(int)EAttributeType::AT_AUTS].value();
+    if (!val.has_value())
+        return 0;
+    if (val->length() != 2)
+        return 0;
+    return val->get2I(0);
 }
 
 void eap::EapAttributes::putRes(const OctetString &value)
@@ -51,11 +79,6 @@ void eap::EapAttributes::putMac(const OctetString &value)
     attributes[(int)EAttributeType::AT_MAC] = OctetString::Concat(OctetString::FromOctet2(0), value);
 }
 
-void eap::EapAttributes::putAutn(const OctetString &value)
-{
-    attributes[(int)EAttributeType::AT_AUTN] = OctetString::Concat(OctetString::FromOctet2(0), value);
-}
-
 void eap::EapAttributes::putKdf(int value)
 {
     attributes[(int)EAttributeType::AT_KDF] = OctetString::FromOctet2(value);
@@ -83,6 +106,12 @@ void eap::EapAttributes::putRawAttribute(eap::EAttributeType key, OctetString &&
     attributes[(int)key] = std::move(value);
 }
 
+OctetString eap::EapAttributes::getKdfInput() const
+{
+    // TODO
+    return OctetString();
+}
+
 eap::Eap::Eap(eap::ECode code, octet id, eap::EEapType eapType) : code(code), id(id), eapType(eapType)
 {
 }

src/lib/nas/eap.hpp

@@ -142,12 +142,11 @@ class EapAttributes
     [[nodiscard]] OctetString getAutn() const;
     [[nodiscard]] int getClientErrorCode() const;
     [[nodiscard]] int getKdf() const;
-    [[nodiscard]] const OctetString &getAuts() const;
+    [[nodiscard]] OctetString getKdfInput() const;
 
   public:
     void putRes(const OctetString &value);
     void putMac(const OctetString &value);
-    void putAutn(const OctetString &value);
     void putKdf(int value);
     void putClientErrorCode(int code);
     void putAuts(OctetString &&auts);