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

crypto-factory: Only sort RNGs by algorithm identifier

Browse Source 
Others remain in the order in which they were added, grouped by
algorithm identifier and sorted by benchmarking speed, if provided.
This commit is contained in:
Tobias Brunner
2014-06-20 16:21:55 +02:00
parent e145f27db7
commit 94dbbd8079
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/crypto_factory.c
+13 -5
View File
@@ -392,10 +392,10 @@ METHOD(crypto_factory_t, create_dh, diffie_hellman_t*,
/**
* Insert an algorithm entry to a list
*
* Entries are sorted by algorithm identifier (which is important for RNGs)
* while maintaining the order in which algorithms were added, unless they were
* Entries maintain the order in which algorithms were added, unless they were
* benchmarked and speed is provided, which then is used to order entries of
* the same algorithm.
* An exception are RNG entries, which are sorted by algorithm identifier.
*/
static void add_entry(private_crypto_factory_t *this, linked_list_t *list,
int algo, const char *plugin_name,
@@ -403,6 +403,7 @@ static void add_entry(private_crypto_factory_t *this, linked_list_t *list,
{
enumerator_t *enumerator;
entry_t *entry, *current;
bool sort = (list == this->rngs), found = FALSE;
INIT(entry,
.algo = algo,
@@ -415,12 +416,19 @@ static void add_entry(private_crypto_factory_t *this, linked_list_t *list,
enumerator = list->create_enumerator(list);
while (enumerator->enumerate(enumerator, &current))
{
if (current->algo > algo)
if (sort && current->algo > algo)
{
break;
}
else if (current->algo == algo && speed &&
current->speed < speed)
else if (current->algo == algo)
{
if (speed > current->speed)
{
break;
}
found = TRUE;
}
else if (found)
{
break;
}