Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

BLOB encryption temporary disabled, as RSA can not encrypt data this long

Browse Source
This commit is contained in:
Simon Rozman 2016-06-22 17:59:26 +02:00
parent 24008000a9
commit d1a4487503
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/EAPBase/include/Module.h
View File

@ -475,6 +475,7 @@ namespace eap
_In_ DWORD dwDataInSize, _In_ DWORD dwDataInSize,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
#if 0
// Prepare cryptographics provider. // Prepare cryptographics provider.
winstd::crypt_prov cp; winstd::crypt_prov cp;
if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) { if (!cp.create(NULL, NULL, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) {
@ -490,6 +491,13 @@ namespace eap
const unsigned char *cursor = data.data(); const unsigned char *cursor = data.data();
eapserial::unpack(cursor, record); eapserial::unpack(cursor, record);
assert(cursor - data.data() <= (ptrdiff_t)data.size()); assert(cursor - data.data() <= (ptrdiff_t)data.size());
#else
UNREFERENCED_PARAMETER(ppEapError);
const unsigned char *cursor = pDataIn;
eapserial::unpack(cursor, record);
assert(cursor - pDataIn <= (ptrdiff_t)dwDataInSize);
#endif
return true; return true;
} }
@ -514,6 +522,7 @@ namespace eap
_Out_ DWORD *pdwDataOutSize, _Out_ DWORD *pdwDataOutSize,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
#if 0
// Allocate BLOB. // Allocate BLOB.
std::vector<unsigned char, winstd::sanitizing_allocator<unsigned char> > data; std::vector<unsigned char, winstd::sanitizing_allocator<unsigned char> > data;
data.resize(eapserial::get_pk_size(record)); data.resize(eapserial::get_pk_size(record));
@ -545,6 +554,22 @@ namespace eap
return false; return false;
} }
memcpy(*ppDataOut, data_enc.data(), *pdwDataOutSize); memcpy(*ppDataOut, data_enc.data(), *pdwDataOutSize);
#else
// Allocate BLOB.
assert(ppDataOut);
assert(pdwDataOutSize);
*pdwDataOutSize = (DWORD)eapserial::get_pk_size(record);
*ppDataOut = alloc_memory(*pdwDataOutSize);
if (!*ppDataOut) {
log_error(*ppEapError = g_peer.make_error(ERROR_OUTOFMEMORY, tstring_printf(_T(__FUNCTION__) _T(" Error allocating memory for BLOB (%uB)."), *pdwDataOutSize).c_str()));
return false;
}
// Pack to BLOB.
unsigned char *cursor = *ppDataOut;
eapserial::pack(cursor, record);
assert(cursor - *ppDataOut <= (ptrdiff_t)*pdwDataOutSize);
#endif
return true; return true;
} }