[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b54611922b5eb760bd64de0c8edfeb13ae81fa65 (commit)
       via  6251895ca8f816a7a8b234eb7f0842fcff2937f4 (commit)
      from  a066841554bd23281ae4bb48badc088753f734ca (commit)


- Log -----------------------------------------------------------------
commit b54611922b5eb760bd64de0c8edfeb13ae81fa65
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 20 09:42:22 2021 +0200

    test/params_conversion_test.c: fix the use of strtoumax and strtoimax on VMS
    
    We do this by making them aliases for strtoull and strtoll, since long
    long is the current largest integer that have this sort of routine on
    VMS.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15366)

commit 6251895ca8f816a7a8b234eb7f0842fcff2937f4
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu May 20 09:42:12 2021 +0200

    Include "internal/numbers.h" in test programs using SIZE_MAX
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15366)

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

Summary of changes:
 test/evp_kdf_test.c           | 1 +
 test/params_conversion_test.c | 5 +++++
 test/params_test.c            | 1 +
 3 files changed, 7 insertions(+)

diff --git a/test/evp_kdf_test.c b/test/evp_kdf_test.c
index cc172db42e..1bed159227 100644
--- a/test/evp_kdf_test.c
+++ b/test/evp_kdf_test.c
@@ -16,6 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/kdf.h>
 #include <openssl/core_names.h>
+#include "internal/numbers.h"
 #include "testutil.h"
 
 static EVP_KDF_CTX *get_kdfbyname(const char *name)
diff --git a/test/params_conversion_test.c b/test/params_conversion_test.c
index 1c3a4716a6..2fc17cc592 100644
--- a/test/params_conversion_test.c
+++ b/test/params_conversion_test.c
@@ -19,6 +19,11 @@
 #  define strcasecmp _stricmp
 # endif
 
+# ifdef OPENSSL_SYS_VMS
+#  define strtoumax strtoull
+#  define strtoimax strtoll
+# endif
+
 typedef struct {
     OSSL_PARAM *param;
     int32_t i32;
diff --git a/test/params_test.c b/test/params_test.c
index dd2d13b862..205c2deab0 100644
--- a/test/params_test.c
+++ b/test/params_test.c
@@ -16,6 +16,7 @@
 #include <openssl/bn.h>
 #include <openssl/core.h>
 #include <openssl/params.h>
+#include "internal/numbers.h"
 #include "internal/nelem.h"
 #include "testutil.h"