diff options
Diffstat (limited to 'crypto/property')
| -rw-r--r-- | crypto/property/property_parse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index 21f78c02e2..41a5a059c5 100644 --- a/crypto/property/property_parse.c +++ b/crypto/property/property_parse.c @@ -568,6 +568,7 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, if (r == NULL) return NULL; + r->has_optional = 0; for (i = j = n = 0; i < a->n || j < b->n; n++) { if (i >= a->n) { copy = &bp[j++]; @@ -581,6 +582,7 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, copy = &bp[j++]; } memcpy(r->properties + n, copy, sizeof(r->properties[0])); + r->has_optional |= copy->optional; } r->n = n; if (n != t) |