[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  b9d022d78faee0648c3ace7f15ccec08f14feddb (commit)
      from  d7c88f760001fae2c608c1d10ae1539fba610288 (commit)


- Log -----------------------------------------------------------------
commit b9d022d78faee0648c3ace7f15ccec08f14feddb
Author: Pauli <pauli at openssl.org>
Date:   Fri Jun 18 14:43:24 2021 +1000

    params: fix range check when converting double to uint64_t.
    
    Found in #15815
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15819)

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

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

diff --git a/crypto/params.c b/crypto/params.c
index a1db5dba26..9049041e3b 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -1029,7 +1029,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
                      * 15 bits of UINT64_MAX to avoid using imprecise floating
                      * point values.
                      */
-                    && (double)(UINT64_MAX - 65535) + 65536.0) {
+                    && val < (double)(UINT64_MAX - 65535) + 65536.0) {
                 p->return_size = sizeof(uint64_t);
                 *(uint64_t *)p->data = (uint64_t)val;
                 return 1;