From: Pauli <pauli@openssl.org>
Date: Mon, 10 May 2021 23:48:22 +0000 (+1000)
Subject: property: create property names more eagerly.
X-Git-Tag: openssl-3.0.0-alpha17~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f12bf71fecf77c3d0def0fd4211be1dc85a53a1;p=thirdparty%2Fopenssl.git

property: create property names more eagerly.

User defined property names were not created before the first fetch.  The
rationale for this was to only maintain the user names defined by providers.
This was intended to prevent malicious memory use attacks.

Not being able to specify a default query before the first fetch is wrong.  This
changes the behaviour of the property query parsing to always create property
names.

Fixes #15218

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15222)
---

diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c
index a41d6331b15..dfae76518f1 100644
--- a/crypto/property/property_parse.c
+++ b/crypto/property/property_parse.c
@@ -407,12 +407,12 @@ OSSL_PROPERTY_LIST *ossl_parse_query(OSSL_LIB_CTX *ctx, const char *s,
         if (match_ch(&s, '-')) {
             prop->oper = PROPERTY_OVERRIDE;
             prop->optional = 0;
-            if (!parse_name(ctx, &s, 0, &prop->name_idx))
+            if (!parse_name(ctx, &s, 1, &prop->name_idx))
                 goto err;
             goto skip_value;
         }
         prop->optional = match_ch(&s, '?');
-        if (!parse_name(ctx, &s, 0, &prop->name_idx))
+        if (!parse_name(ctx, &s, 1, &prop->name_idx))
             goto err;
 
         if (match_ch(&s, '=')) {