[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  c04a9916d4443a805d11a467d69585e514b50296 (commit)
      from  3119c849761a12371794044eda807f7eacb1e589 (commit)


- Log -----------------------------------------------------------------
commit c04a9916d4443a805d11a467d69585e514b50296
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Mon Aug 12 11:37:53 2019 +1000

    Fix windows compile errors in params.c
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9569)

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

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

diff --git a/crypto/params.c b/crypto/params.c
index 87a66820ce..b3fbb12b9b 100644
--- a/crypto/params.c
+++ b/crypto/params.c
@@ -11,6 +11,7 @@
 #include <string.h>
 #include <openssl/params.h>
 #include "internal/thread_once.h"
+#include "internal/numbers.h"
 
 OSSL_PARAM *OSSL_PARAM_locate(OSSL_PARAM *p, const char *key)
 {
@@ -685,7 +686,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
             return 1;
         }
     } else if (p->data_type == OSSL_PARAM_UNSIGNED_INTEGER
-               && val == (uintmax_t)val) {
+               && val == (ossl_uintmax_t)val) {
         p->return_size = sizeof(double);
         switch (p->data_size) {
         case sizeof(uint32_t):
@@ -702,7 +703,7 @@ int OSSL_PARAM_set_double(OSSL_PARAM *p, double val)
                 return 1;
             }
             break;            }
-    } else if (p->data_type == OSSL_PARAM_INTEGER && val == (intmax_t)val) {
+    } else if (p->data_type == OSSL_PARAM_INTEGER && val == (ossl_intmax_t)val) {
         p->return_size = sizeof(double);
         switch (p->data_size) {
         case sizeof(int32_t):