[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  97ba39547d4c79b60131475a1512cc7d7e8952b2 (commit)
      from  dd0139f416257ec5632414ed3ad8c61d07ba07ec (commit)


- Log -----------------------------------------------------------------
commit 97ba39547d4c79b60131475a1512cc7d7e8952b2
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Dec 10 20:38:09 2019 +0100

    test/namemap_internal_test.c: use "cookie" instead of "foo"...
    
    ... in test_namemap()
    
    Because tests may sometimes run in random order (subject of the
    environment variable OPENSSL_TEST_RAND_ORDER being defined), and we're
    dealing with the global namemap, each test must use names that are
    globally unique for that test.  Unfortunately, we used "foo" in two of
    them, which might lead to surprising results.
    
    Fixes #10401
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/10601)

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

Summary of changes:
 test/namemap_internal_test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/namemap_internal_test.c b/test/namemap_internal_test.c
index 0b67cb1d3f..263364adbd 100644
--- a/test/namemap_internal_test.c
+++ b/test/namemap_internal_test.c
@@ -26,7 +26,7 @@ static int test_namemap(OSSL_NAMEMAP *nm)
     int check2 = ossl_namemap_name2num(nm, NAME2);
     int check3 = ossl_namemap_name2num(nm, ALIAS1);
     int check4 = ossl_namemap_name2num(nm, ALIAS1_UC);
-    int false1 = ossl_namemap_name2num(nm, "foo");
+    int false1 = ossl_namemap_name2num(nm, "cookie");
 
     return TEST_int_ne(num1, 0)
         && TEST_int_ne(num2, 0)