crypto-factory: Only sort RNGs by algorithm identifier

Others remain in the order in which they were added, grouped by
algorithm identifier and sorted by benchmarking speed, if provided.

diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c
index 6dea30ee3d2a456e894cc700853512abc54db770..96fbc0d87f2e92db06a18385396bf3a3340a85b5 100644 (file)
--- a/src/libstrongswan/crypto/crypto_factory.c
+++ b/src/libstrongswan/crypto/crypto_factory.c
@@ -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;
                }