[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  d3620841cc39aaa4a3d75ea32e94ccd110b5bef4 (commit)
       via  932c3d0f6706a08932d89c8610b06cb57fba13ce (commit)
       via  847275075f971afeb5fa928c078edf3bc17cddb3 (commit)
      from  62ca15650576f3953103b27e220e4ff4cc4abed5 (commit)


- Log -----------------------------------------------------------------
commit d3620841cc39aaa4a3d75ea32e94ccd110b5bef4
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 13 14:06:03 2019 +0100

    test/params_test.c: use TEST_double_eq to check doubles
    
    TEST_ulong_eq was used previously because TEST_double_eq didn't exist
    at the time.
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/8469)

commit 932c3d0f6706a08932d89c8610b06cb57fba13ce
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 13 14:01:27 2019 +0100

    test/params_test.c: make more global variables static
    
    Again, compilers that don't like them being undeclared...
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/8469)

commit 847275075f971afeb5fa928c078edf3bc17cddb3
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 13 13:56:46 2019 +0100

    test/params_test.c: make construct_api_params() static
    
    With enough warning flags, compilers complain when a non-static
    function hasn't been properly declared...
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/8469)

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

Summary of changes:
 test/params_test.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/params_test.c b/test/params_test.c
index 09b6c50..338e6b2 100644
--- a/test/params_test.c
+++ b/test/params_test.c
@@ -387,7 +387,7 @@ static const OSSL_PARAM static_api_params[] = {
  * The same array again, but constructed at run-time
  * This exercises the OSSL_PARAM constructor functions
  */
-OSSL_PARAM *construct_api_params(void)
+static OSSL_PARAM *construct_api_params(void)
 {
     size_t n = 0;
     static OSSL_PARAM params[10];
@@ -414,11 +414,11 @@ struct param_owner_st {
     OSSL_PARAM *(*constructed_params)(void);
 };
 
-struct param_owner_st raw_params = {
+static const struct param_owner_st raw_params = {
     static_raw_params, NULL
 };
 
-struct param_owner_st api_params = {
+static const struct param_owner_st api_params = {
     static_api_params, construct_api_params
 };
 
@@ -469,7 +469,7 @@ static int test_case_variant(const OSSL_PARAM *params,
 
     if (!TEST_true(prov->get_params(obj, params))
         || !TEST_int_eq(app_p1, p1_init)        /* "provider" value */
-        || !TEST_ulong_eq(app_p2, app_p2_init)  /* Should remain untouched */
+        || !TEST_double_eq(app_p2, app_p2_init) /* Should remain untouched */
         || !TEST_ptr(BN_native2bn(bignumbin, bignumbin_l, app_p3))
         || !TEST_BN_eq(app_p3, verify_p3)       /* "provider" value */
         || !TEST_str_eq(app_p4, p4_init)        /* "provider" value */
@@ -491,7 +491,7 @@ static int test_case_variant(const OSSL_PARAM *params,
         struct object_st *sneakpeek = obj;
 
         if (!TEST_int_eq(sneakpeek->p1, app_p1)         /* app value set */
-            || !TEST_ulong_eq(sneakpeek->p2, p2_init) /* Should remain untouched */
+            || !TEST_double_eq(sneakpeek->p2, p2_init)  /* Should remain untouched */
             || !TEST_BN_eq(sneakpeek->p3, app_p3)       /* app value set */
             || !TEST_str_eq(sneakpeek->p4, app_p4)      /* app value set */
             || !TEST_str_eq(sneakpeek->p5, app_p5))     /* app value set */
@@ -512,7 +512,7 @@ static int test_case_variant(const OSSL_PARAM *params,
 
     if (!TEST_true(prov->get_params(obj, params))
         || !TEST_int_eq(app_p1, app_p1_init)    /* app value */
-        || !TEST_ulong_eq(app_p2, app_p2_init)  /* Should remain untouched */
+        || !TEST_double_eq(app_p2, app_p2_init) /* Should remain untouched */
         || !TEST_ptr(BN_native2bn(bignumbin, bignumbin_l, app_p3))
         || !TEST_BN_eq(app_p3, verify_p3)       /* app value */
         || !TEST_str_eq(app_p4, app_p4_init)    /* app value */