denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdf: Implement prf+ directly without relying on prf_plus_t

Browse Source
This commit is contained in:
Tobias Brunner
2022-04-14 19:02:56 +02:00
parent 9cb3c10418
commit f0957d1250
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/kdf/kdf_prf_plus.c
+26 -8
View File
@@ -22,8 +22,6 @@
#include "kdf_prf_plus.h" #include "kdf_prf_plus.h"
#include <crypto/prf_plus.h>
typedef struct private_kdf_t private_kdf_t; typedef struct private_kdf_t private_kdf_t;
/** /**
@@ -56,16 +54,36 @@ METHOD(kdf_t, get_type, key_derivation_function_t,
METHOD(kdf_t, get_bytes, bool, METHOD(kdf_t, get_bytes, bool,
private_kdf_t *this, size_t out_len, uint8_t *buffer) private_kdf_t *this, size_t out_len, uint8_t *buffer)
{ {
prf_plus_t *prf_plus; chunk_t block, previous = chunk_empty;
bool success; uint8_t counter = 1, *out = buffer;
size_t len;
bool success = TRUE;
prf_plus = prf_plus_create(this->prf, TRUE, this->salt); block = chunk_alloca(this->prf->get_block_size(this->prf));
if (!prf_plus) if (out_len > block.len * 255)
{ {
return FALSE; return FALSE;
} }
success = prf_plus->get_bytes(prf_plus, out_len, buffer);
prf_plus->destroy(prf_plus); while (out_len)
{
if (!this->prf->get_bytes(this->prf, previous, NULL) ||
!this->prf->get_bytes(this->prf, this->salt, NULL) ||
!this->prf->get_bytes(this->prf, chunk_from_thing(counter),
block.ptr))
{
success = FALSE;
break;
}
len = min(out_len, block.len);
memcpy(out, block.ptr, len);
previous = chunk_create(out, block.len);
out_len -= len;
out += len;
counter++;
}
memwipe(block.ptr, block.len);
return success; return success;
} }