If the first serializer we find is the desired one that's ok

Stop looking for a desired serializer if the first one is desired.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11271)

diff --git a/crypto/serializer/serializer_pkey.c b/crypto/serializer/serializer_pkey.c
index 3f1eb5851a2ded677c7419fd371b2cc5a2170bd2..4b1bf5c3ee1d62a447097c2aab434d63f33f1dbb 100644 (file)
--- a/crypto/serializer/serializer_pkey.c
+++ b/crypto/serializer/serializer_pkey.c
@@ -121,13 +121,13 @@ static void select_serializer(const char *name, void *data)
         return;
 
     if ((s = OSSL_SERIALIZER_fetch(d->libctx, name, d->propquery)) != NULL) {
         return;
 
     if ((s = OSSL_SERIALIZER_fetch(d->libctx, name, d->propquery)) != NULL) {

-        if (d->first == NULL && s->serialize_data != NULL) {
-            d->first = s;
-        } else if (OSSL_SERIALIZER_provider(s) == d->desired_provider
-                   && s->serialize_object != NULL) {
+        if (OSSL_SERIALIZER_provider(s) == d->desired_provider
+                && s->serialize_object != NULL) {

             OSSL_SERIALIZER_free(d->first);
             d->first = NULL;
             d->desired = s;
             OSSL_SERIALIZER_free(d->first);
             d->first = NULL;
             d->desired = s;

+        } else if (d->first == NULL && s->serialize_data != NULL) {
+            d->first = s;

         } else {
             OSSL_SERIALIZER_free(s);
         }
         } else {
             OSSL_SERIALIZER_free(s);
         }