[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  9350aaa41db8fcb0b55dadbd5fbe807ef5288557 (commit)
      from  2349d7ba57c9327290df6f7bc18b7f0c3976ca9e (commit)


- Log -----------------------------------------------------------------
commit 9350aaa41db8fcb0b55dadbd5fbe807ef5288557
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Fri Nov 19 11:58:40 2021 +0100

    ERR: exempt flags from fallback decimal reason code printing
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/17072)

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

Summary of changes:
 crypto/err/err.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 60a9b02d19..0f584fdf80 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -527,7 +527,8 @@ void ossl_err_string_int(unsigned long e, const char *func,
     }
 #endif
     if (rs == NULL) {
-        BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)", r);
+        BIO_snprintf(rsbuf, sizeof(rsbuf), "reason(%lu)",
+                     r & ~(ERR_RFLAGS_MASK << ERR_RFLAGS_OFFSET));
         rs = rsbuf;
     }