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

Non TLS1PRF case fixed in method_tls::prf()

Browse Source
This commit is contained in:
Simon Rozman 2016-08-14 13:31:39 +02:00
parent 940def31e6
commit 9a2663eb18
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/TLS/src/Method.cpp
View File

@ -1373,13 +1373,13 @@ eap::sanitizing_blob eap::method_tls::prf(
sanitizing_blob hmac; sanitizing_blob hmac;
for (size_t i = 0; i < size; ) { for (size_t i = 0; i < size; ) {
// Rehash A. // Rehash A.
hash_hmac hash1(m_cp, CALG_MD5 , hmac_padding.data()); hash_hmac hash1(m_cp, m_state.m_alg_prf, hmac_padding.data());
if (!CryptHashData(hash1, A.data(), (DWORD)A.size(), 0)) if (!CryptHashData(hash1, A.data(), (DWORD)A.size(), 0))
throw win_runtime_error(__FUNCTION__ " Error hashing A."); throw win_runtime_error(__FUNCTION__ " Error hashing A.");
hash1.calculate(A); hash1.calculate(A);
// Hash A and seed. // Hash A and seed.
hash_hmac hash2(m_cp, CALG_MD5 , hmac_padding.data()); hash_hmac hash2(m_cp, m_state.m_alg_prf, hmac_padding.data());
if (!CryptHashData(hash2, A.data(), (DWORD)A.size() , 0) || if (!CryptHashData(hash2, A.data(), (DWORD)A.size() , 0) ||
!CryptHashData(hash2, (const BYTE*)seed , (DWORD)size_seed, 0)) !CryptHashData(hash2, (const BYTE*)seed , (DWORD)size_seed, 0))
throw win_runtime_error(__FUNCTION__ " Error hashing seed,label or data."); throw win_runtime_error(__FUNCTION__ " Error hashing seed,label or data.");
@ -1387,6 +1387,7 @@ eap::sanitizing_blob eap::method_tls::prf(
size_t n = std::min<size_t>(hmac.size(), size - i); size_t n = std::min<size_t>(hmac.size(), size - i);
data.insert(data.end(), hmac.begin(), hmac.begin() + n); data.insert(data.end(), hmac.begin(), hmac.begin() + n);
i += n;
} }
} }