[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  06447b58b234be050d405c6c75bfc987c6dcfdf9 (commit)
      from  0760d132da046063f6ac3c28bd2ee1d8505e6fcd (commit)


- Log -----------------------------------------------------------------
commit 06447b58b234be050d405c6c75bfc987c6dcfdf9
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Aug 23 11:11:29 2021 +0200

    Avoid using undefined value in generate_stateless_cookie_callback
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16384)

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

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

diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index 245bae6249..c9a611aa3a 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -823,7 +823,8 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie,
     size_t temp = 0;
     int res = generate_stateless_cookie_callback(ssl, cookie, &temp);
 
-    *cookie_len = (unsigned int)temp;
+    if (res != 0)
+        *cookie_len = (unsigned int)temp;
     return res;
 }