[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  7ffce852372799b6cd856b711db21332f0048314 (commit)
      from  d0bcad73253b7ea0a6f8a4ebd2aa567257cd2101 (commit)


- Log -----------------------------------------------------------------
commit 7ffce852372799b6cd856b711db21332f0048314
Author: Arne Schwabe <arne at rfc2549.org>
Date:   Thu Apr 23 12:42:51 2020 +0200

    Fix type cast in SSL_CTX_set1_groups macro
    
    The macro casts the glist parameter to char*
    instead of (int *) like the documentation of the function suggest.
    
    Also the function tls1_set_groups that is called from SSL_CTX_ctrl
    takes an int * argument. This looks like a copy&paste error from
    SSL_CTX_set1_groups_list function.
    
    CLA: trivial
    Signed-off-by: Arne Schwabe <arne at rfc2549.org>
    
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11614)

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

Summary of changes:
 include/openssl/ssl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 7a2b418bf7..551ba40046 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1416,7 +1416,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
 # define SSL_get1_groups(s, glist) \
         SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
 # define SSL_CTX_set1_groups(ctx, glist, glistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist))
+        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(int *)(glist))
 # define SSL_CTX_set1_groups_list(ctx, s) \
         SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s))
 # define SSL_set1_groups(s, glist, glistlen) \