property: correctly set the has optional flag when merging property lists
authorPauli <paul.dale@oracle.com>
Mon, 15 Jun 2020 00:07:50 +0000 (10:07 +1000)
committerPauli <paul.dale@oracle.com>
Tue, 23 Jun 2020 11:44:47 +0000 (21:44 +1000)
commite3d6dc59fb3689f92d890a20fb5e1e5588dc95b8
treeac461de3a91f5ebb3460358da8e10f59b038cb41
parentf9e504e8b1d4da4b8c9c16ee4c11e9815a800422
property: correctly set the has optional flag when merging property lists

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12123)
crypto/property/property_parse.c