Encryption enhanced and moved to module

lib/EAPBase/src/Module.cpp

@@ -121,3 +121,73 @@ void eap::module::free_error_memory(_In_ EAP_ERROR *err)
     // pRootCauseString and pRepairString always trail the ppEapError to reduce number of (de)allocations.
     HeapFree(m_heap, 0, err);
 }
+
+
+DWORD eap::module::encrypt(_In_ HCRYPTPROV hProv, _In_bytecount_(size) const void *data, _In_ size_t size, _Out_ std::vector<unsigned char> &enc, _Out_ EAP_ERROR **ppEapError, _Out_opt_ HCRYPTHASH hHash) const
+{
+    assert(ppEapError);
+    DWORD dwResult;
+
+    // Import the public key.
+    HRSRC res = FindResource(m_instance, MAKEINTRESOURCE(IDR_EAP_KEY_PUBLIC), RT_RCDATA);
+    assert(res);
+    HGLOBAL res_handle = LoadResource(m_instance, res);
+    assert(res_handle);
+    crypt_key key;
+    unique_ptr<CERT_PUBLIC_KEY_INFO, LocalFree_delete<CERT_PUBLIC_KEY_INFO> > keyinfo_data;
+    DWORD keyinfo_size = 0;
+    if (!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_PUBLIC_KEY_INFO, (const BYTE*)::LockResource(res_handle), ::SizeofResource(m_instance, res), CRYPT_DECODE_ALLOC_FLAG, NULL, &keyinfo_data, &keyinfo_size)) {
+        *ppEapError = make_error(dwResult = GetLastError(), 0, NULL, NULL, NULL, _T(__FUNCTION__) _T(" CryptDecodeObjectEx failed."), NULL);
+        return dwResult;
+    }
+
+    if (!key.import_public(hProv, X509_ASN_ENCODING, keyinfo_data.get())) {
+        *ppEapError = make_error(dwResult = GetLastError(), 0, NULL, NULL, NULL, _T(__FUNCTION__) _T(" Public key import failed."), NULL);
+        return dwResult;
+    }
+
+    // Pre-allocate memory to allow space, as encryption will grow the data.
+    DWORD dwBlockLen;
+    vector<unsigned char, sanitizing_allocator<unsigned char> > buf(size);
+    memcpy(buf.data(), data, size);
+    if (!CryptGetKeyParam(key, KP_BLOCKLEN, dwBlockLen, 0)) dwBlockLen = 0;
+    buf.reserve((size + dwBlockLen - 1) / dwBlockLen * dwBlockLen);
+
+    // Encrypt the data using our public key.
+    if (!CryptEncrypt(key, hHash, TRUE, 0, buf)) {
+        *ppEapError = make_error(dwResult = GetLastError(), 0, NULL, NULL, NULL, _T(__FUNCTION__) _T(" Encrypting data failed."), NULL);
+        return dwResult;
+    }
+
+    // Copy encrypted data.
+    enc.assign(buf.begin(), buf.end());
+
+    return ERROR_SUCCESS;
+}
+
+
+DWORD eap::module::encrypt_md5(_In_ HCRYPTPROV hProv, _In_bytecount_(size) const void *data, _In_ size_t size, _Out_ std::vector<unsigned char> &enc, _Out_ EAP_ERROR **ppEapError) const
+{
+    DWORD dwResult;
+
+    // Create hash.
+    crypt_hash hash;
+    if (!hash.create(hProv, CALG_MD5)) {
+        *ppEapError = make_error(dwResult = GetLastError(), 0, NULL, NULL, NULL, _T(__FUNCTION__) _T(" Creating MD5 hash failed."), NULL);
+        return dwResult;
+    }
+
+    // Encrypt data.
+    if ((dwResult = encrypt(hProv, data, size, enc, ppEapError, hash)) != ERROR_SUCCESS)
+        return dwResult;
+
+    // Calculate MD5 hash and append it.
+    vector<unsigned char> hash_bin;
+    if (!CryptGetHashParam(hash, HP_HASHVAL, hash_bin, 0)) {
+        *ppEapError = make_error(dwResult = GetLastError(), 0, NULL, NULL, NULL, _T(__FUNCTION__) _T(" Calculating MD5 hash failed."), NULL);
+        return dwResult;
+    }
+    enc.insert(enc.end(), hash_bin.begin(), hash_bin.end());
+
+    return ERROR_SUCCESS;
+}