[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  805bdac5f37bb820658f70269941086bef6c085b (commit)
      from  ad1a1d715dcab875dafd6e792b8eb65eb84d6b9f (commit)


- Log -----------------------------------------------------------------
commit 805bdac5f37bb820658f70269941086bef6c085b
Author: Matt Caswell <m...@openssl.org>
Date:   Wed Dec 29 14:44:00 2021 +0000

    Fix the symbol_presence test with a shlib_variant
    
    If a shlib_variant is used then the dynamic version information for
    symbols will be different from what the symbol presence test was
    expecting. We just make it more liberal about what it accepts as dynamic
    version information.
    
    Fixes #17366
    
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17372)

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

Summary of changes:
 test/recipes/01-test_symbol_presence.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/01-test_symbol_presence.t 
b/test/recipes/01-test_symbol_presence.t
index efe0760c25..5530ade0ad 100644
--- a/test/recipes/01-test_symbol_presence.t
+++ b/test/recipes/01-test_symbol_presence.t
@@ -76,7 +76,7 @@ foreach my $libname (@libnames) {
                 # Drop the first space and everything following it
                 s| .*||;
                 # Drop OpenSSL dynamic version information if there is any
-                s|\@\@OPENSSL_[0-9._]+[a-z]?$||;
+                s|\@\@.+$||;
                 # Return the result
                 $_
             }