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

Memory sanitizing on BLOB free removed, since BLOBS are encrypted from d15b7066cd9cd9f1fe4accab095ac347c8590274 on

Browse Source
This commit is contained in:
Simon Rozman 2016-07-20 08:48:28 +02:00
parent 4630b32f77
commit 40c992e1a5
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/EAPBase/include/EAP.h
View File

@ -21,6 +21,10 @@
#define IDR_EAP_KEY_PUBLIC 1 #define IDR_EAP_KEY_PUBLIC 1
#define IDR_EAP_KEY_PRIVATE 2 #define IDR_EAP_KEY_PRIVATE 2
#ifndef EAP_ENCRYPT_BLOBS
#define EAP_ENCRYPT_BLOBS 1
#endif
#if !defined(RC_INVOKED) && !defined(MIDL_PASS) #if !defined(RC_INVOKED) && !defined(MIDL_PASS)
#include <sal.h> #include <sal.h>

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

@ -543,7 +543,7 @@ namespace eap
_In_ DWORD dwDataInSize, _In_ DWORD dwDataInSize,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
#if 1 #if EAP_ENCRYPT_BLOBS
// 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)) {
@ -590,7 +590,7 @@ namespace eap
_Out_ DWORD *pdwDataOutSize, _Out_ DWORD *pdwDataOutSize,
_Out_ EAP_ERROR **ppEapError) _Out_ EAP_ERROR **ppEapError)
{ {
#if 1 #if EAP_ENCRYPT_BLOBS
// 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));

2
lib/EAPBase/src/Module.cpp
View File

@ -93,8 +93,10 @@ BYTE* eap::module::alloc_memory(_In_ size_t size)
void eap::module::free_memory(_In_ BYTE *ptr) void eap::module::free_memory(_In_ BYTE *ptr)
{ {
#if !EAP_ENCRYPT_BLOBS
// Since we do security here and some of the BLOBs contain credentials, sanitize every memory block before freeing. // Since we do security here and some of the BLOBs contain credentials, sanitize every memory block before freeing.
SecureZeroMemory(ptr, HeapSize(m_heap, 0, ptr)); SecureZeroMemory(ptr, HeapSize(m_heap, 0, ptr));
#endif
HeapFree(m_heap, 0, ptr); HeapFree(m_heap, 0, ptr);
} }