[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  a289d3a4272b20a5bae5aa6f527eed5d9bb2d8bb (commit)
      from  2217d4c9ccde174a66cc4022c7d65614379b2ae7 (commit)


- Log -----------------------------------------------------------------
commit a289d3a4272b20a5bae5aa6f527eed5d9bb2d8bb
Author: Tomas Mraz <tomas at openssl.org>
Date:   Tue Mar 16 13:26:24 2021 +0100

    property_test: use property values that are not used elsewhere
    
    In test_property_query_value_create() we depend on the property
    values to not be created by other test cases. Use such
    values.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14573)

-----------------------------------------------------------------------

Summary of changes:
 test/property_test.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/property_test.c b/test/property_test.c
index add16ea629..d2255a26b4 100644
--- a/test/property_test.c
+++ b/test/property_test.c
@@ -129,11 +129,12 @@ static int test_property_query_value_create(void)
     OSSL_PROPERTY_LIST *p = NULL, *q = NULL, *o = NULL;
     int r = 0;
 
+    /* The property value used here must not be used in other test cases */
     if (TEST_ptr(store = ossl_method_store_new(NULL))
-        && add_property_names("sky", NULL)
-        && TEST_ptr(p = ossl_parse_query(NULL, "sky=green", 0)) /* undefined */
-        && TEST_ptr(q = ossl_parse_query(NULL, "sky=green", 1)) /* creates */
-        && TEST_ptr(o = ossl_parse_query(NULL, "sky=green", 0)) /* defined */
+        && add_property_names("wood", NULL)
+        && TEST_ptr(p = ossl_parse_query(NULL, "wood=oak", 0)) /* undefined */
+        && TEST_ptr(q = ossl_parse_query(NULL, "wood=oak", 1)) /* creates */
+        && TEST_ptr(o = ossl_parse_query(NULL, "wood=oak", 0)) /* defined */
         && TEST_int_eq(ossl_property_match_count(q, p), -1)
         && TEST_int_eq(ossl_property_match_count(q, o), 1))
         r = 1;