From: Pauli <ppzgs1@gmail.com>
Date: Fri, 11 Jul 2025 06:03:12 +0000 (+1000)
Subject: params: revert error checking when params are duplicated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=454119a62575717274dd3f25c2debb334f5c2c70;p=thirdparty%2Fopenssl.git

params: revert error checking when params are duplicated

This is to avoid a change of behaviour even though it is a result of user
error.  When params are duplicated, all but the first are ignored and no
error is returned.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
---

diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
index e13deb476f9..76efdd1f943 100644
--- a/util/perl/OpenSSL/paramnames.pm
+++ b/util/perl/OpenSSL/paramnames.pm
@@ -657,9 +657,8 @@ sub trie_matched {
     printf "%sreturn 0;\n", $indent2;
     printf "%sr->%s[r->num_%s++] = (OSSL_PARAM *)p;\n", $indent1, $field, $field;
   } else {
-    printf "%sif (ossl_unlikely(r->%s != NULL))\n", $indent1, $field;
-    printf "%sreturn 0;\n", $indent2;
-    printf "%sr->%s = (OSSL_PARAM *)p;\n", $indent1, $field;
+    printf "%sif (ossl_likely(r->%s == NULL))\n", $indent1, $field;
+    printf "%sr->%s = (OSSL_PARAM *)p;\n", $indent2, $field;
   }
 }