The branch master has been updated via bf991b25caa6e915d858dd56c98ee774f248f03c (commit) via d2f53212933f751ef76acca9cc05bcb67d799964 (commit) via 857cbe176f28e3f178e492159fa9f2f203e845cd (commit) via fea559085bbe873f0f81751653cf673a7b00a95c (commit) via ac2aa13aaf6d4c5457fd99edd82659cb5b662816 (commit) from bba402ece781db0918e0a27289cf38479bafb023 (commit)
- Log ----------------------------------------------------------------- commit bf991b25caa6e915d858dd56c98ee774f248f03c Author: Richard Levitte <levi...@openssl.org> Date: Mon May 17 22:58:27 2021 +0200 Make sure to include "crypto/ctype.h" to get ossl_isdigit() Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15319) commit d2f53212933f751ef76acca9cc05bcb67d799964 Author: Richard Levitte <levi...@openssl.org> Date: Mon May 17 21:38:51 2021 +0200 Make sure to include "internal/numbers.h" to get SIZE_MAX Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15319) commit 857cbe176f28e3f178e492159fa9f2f203e845cd Author: Richard Levitte <levi...@openssl.org> Date: Mon May 17 20:20:35 2021 +0200 Fix crypto/bio/b_sock.c for VMS Current VMS C-RTL does not have <sys/select.h>. <sys/socket.h> is a good enough replacement to get fd_set. Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15319) commit fea559085bbe873f0f81751653cf673a7b00a95c Author: Richard Levitte <levi...@openssl.org> Date: Mon May 17 15:16:58 2021 +0200 Fix include/internal/sockets.h for VMS It needs to include <openssl/opensslconf.h> Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15319) commit ac2aa13aaf6d4c5457fd99edd82659cb5b662816 Author: Richard Levitte <levi...@openssl.org> Date: Mon May 17 15:15:44 2021 +0200 Fix include/openssl/e_os2.h for VMS It would try to define OPENSSL_SYS_VMS if that macro is defined. That's just not right. Reviewed-by: Paul Dale <pa...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15319) ----------------------------------------------------------------------- Summary of changes: crypto/bio/b_sock.c | 12 ++++++++---- crypto/evp/m_sigver.c | 1 + crypto/evp/p_lib.c | 1 + crypto/evp/signature.c | 1 + engines/e_loader_attic.c | 1 + include/internal/sockets.h | 3 ++- include/openssl/e_os2.h | 4 ++-- providers/implementations/storemgmt/file_store.c | 1 + 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index d0cdae7b3d..ca45886739 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -29,11 +29,15 @@ static int wsa_init_done = 0; # if defined(OPENSSL_TANDEM_FLOSS) # include <floss.h(floss_select)> # endif -# elif !defined _WIN32 -# include <unistd.h> -# include <sys/select.h> -# else +# elif defined _WIN32 # include <winsock.h> /* for type fd_set */ +# else +# include <unistd.h> +# if defined __VMS +# include <sys/socket.h> +# else +# include <sys/select.h> +# endif # endif # ifndef OPENSSL_NO_DEPRECATED_1_1_0 diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index 0a51493efb..17565554e0 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -14,6 +14,7 @@ #include <openssl/x509.h> #include "crypto/evp.h" #include "internal/provider.h" +#include "internal/numbers.h" /* includes SIZE_MAX */ #include "evp_local.h" #ifndef FIPS_MODULE diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 6a8dc9bbbb..00a310d4e4 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -34,6 +34,7 @@ #include <openssl/encoder.h> #include <openssl/core_names.h> +#include "internal/numbers.h" /* includes SIZE_MAX */ #include "internal/ffc.h" #include "crypto/asn1.h" #include "crypto/evp.h" diff --git a/crypto/evp/signature.c b/crypto/evp/signature.c index c945eaae5e..e80d4f503d 100644 --- a/crypto/evp/signature.c +++ b/crypto/evp/signature.c @@ -11,6 +11,7 @@ #include <stdlib.h> #include <openssl/objects.h> #include <openssl/evp.h> +#include "internal/numbers.h" /* includes SIZE_MAX */ #include "internal/cryptlib.h" #include "internal/provider.h" #include "internal/core.h" diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index 4cb98280a5..faa598f85e 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -33,6 +33,7 @@ #include "internal/asn1.h" /* For asn1_d2i_read_bio */ #include "internal/o_dir.h" #include "internal/cryptlib.h" +#include "crypto/ctype.h" /* For ossl_isdigit */ #include "crypto/pem.h" /* For PVK and "blob" PEM headers */ #include "e_loader_attic_err.c" diff --git a/include/internal/sockets.h b/include/internal/sockets.h index 5ef5ef1756..6e882fa6aa 100644 --- a/include/internal/sockets.h +++ b/include/internal/sockets.h @@ -7,11 +7,12 @@ * https://www.openssl.org/source/license.html */ - #ifndef OSSL_INTERNAL_SOCKETS_H # define OSSL_INTERNAL_SOCKETS_H # pragma once +# include <openssl/opensslconf.h> + # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI) # define NO_SYS_PARAM_H # endif diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index f17a373493..4ee41cad26 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -102,11 +102,11 @@ extern "C" { # endif /* ------------------------------- OpenVMS -------------------------------- */ -# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYS_VMS) +# if defined(__VMS) || defined(VMS) # if !defined(OPENSSL_SYS_VMS) # undef OPENSSL_SYS_UNIX +# define OPENSSL_SYS_VMS # endif -# define OPENSSL_SYS_VMS # if defined(__DECC) # define OPENSSL_SYS_VMS_DECC # elif defined(__DECCXX) diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c index b9bb3b36c0..04021f49c2 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c @@ -26,6 +26,7 @@ #include "internal/cryptlib.h" #include "internal/o_dir.h" #include "crypto/decoder.h" +#include "crypto/ctype.h" /* ossl_isdigit() */ #include "prov/implementations.h" #include "prov/bio.h" #include "file_store_local.h"