Common PAP and MSCHAPv2 code merged in intermediate base class method_noneap

lib/EAPBase/include/Method.h

@@ -24,6 +24,11 @@ namespace eap
     /// EAP and non-EAP method base class
     ///
     class method;
+
+    ///
+    /// Non-EAP method base class
+    ///
+    class method_noneap;
 }
 
 #pragma once
@@ -134,4 +139,51 @@ namespace eap
         credentials &m_cred;                        ///< User credentials
         std::vector<winstd::eap_attr> m_eap_attr;   ///< EAP attributes
     };
+
+
+    class method_noneap : public method
+    {
+    public:
+        ///
+        /// Constructs an EAP method
+        ///
+        /// \param[in] mod   EAP module to use for global services
+        /// \param[in] cfg   Method configuration
+        /// \param[in] cred  User credentials
+        ///
+        method_noneap(_In_ module &module, _In_ config_method_with_cred &cfg, _In_ credentials &cred);
+
+        ///
+        /// Moves an EAP method
+        ///
+        /// \param[in] other  EAP method to move from
+        ///
+        method_noneap(_Inout_ method_noneap &&other);
+
+        ///
+        /// Moves an EAP method
+        ///
+        /// \param[in] other  EAP method to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        method_noneap& operator=(_Inout_ method_noneap &&other);
+
+        /// \name Packet processing
+        /// @{
+
+        ///
+        /// Obtains a response packet from the EAP method.
+        ///
+        /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
+        ///
+        virtual void get_response_packet(
+            _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
+            _Inout_                            DWORD *pdwSendPacketSize);
+
+        /// @}
+
+    protected:
+        sanitizing_blob m_packet_res;   ///< Response packet
+    };
 }

lib/EAPBase/src/Method.cpp

@@ -74,3 +74,48 @@ void eap::method::begin_session(
 void eap::method::end_session()
 {
 }
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::method_noneap
+//////////////////////////////////////////////////////////////////////
+
+eap::method_noneap::method_noneap(_In_ module &module, _In_ config_method_with_cred &cfg, _In_ credentials &cred) : method(module, cfg, cred)
+{
+}
+
+
+eap::method_noneap::method_noneap(_Inout_ method_noneap &&other) :
+    m_packet_res(std::move(other.m_packet_res)),
+    method      (std::move(other             ))
+{
+}
+
+
+eap::method_noneap& eap::method_noneap::operator=(_Inout_ method_noneap &&other)
+{
+    if (this != std::addressof(other)) {
+        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method with same credentials only!
+        (method&)*this = std::move(other             );
+        m_packet_res   = std::move(other.m_packet_res);
+    }
+
+    return *this;
+}
+
+
+void eap::method_noneap::get_response_packet(
+    _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
+    _Inout_                            DWORD *pdwSendPacketSize)
+{
+    assert(pdwSendPacketSize);
+    assert(pSendPacket);
+
+    size_t size_packet = m_packet_res.size();
+    if (size_packet > *pdwSendPacketSize)
+        throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", size_packet, *pdwSendPacketSize).c_str());
+
+    memcpy(pSendPacket, m_packet_res.data(), size_packet);
+    *pdwSendPacketSize = (DWORD)size_packet;
+    m_packet_res.clear();
+}