← Commit list

cdab112af3

Viktor Szakats

2026-08-26

SUCCESS Duration: 426s

Subject

tidy-up: minimum version comments and messages

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

.clang-tidy.yml+2 -2

@@ -8,7 +8,7 @@
	Checks:
	- clang-analyzer-*
	- -clang-analyzer-optin.performance.Padding
-	- -clang-analyzer-security.ArrayBound # due to false positives with clang-tidy v21.1.0+
+	- -clang-analyzer-security.ArrayBound # due to false positives with clang-tidy 21.1.0+
	- -clang-analyzer-security.insecureAPI.bzero # for FD_ZERO() (seen on macOS)
	- -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling
	- -clang-diagnostic-nullability-extension
@@ -56,4 +56,4 @@ CheckOptions:
	misc-header-include-cycle.IgnoredFilesList: 'curl/curl.h'
	readability-inconsistent-declaration-parameter-name.Strict: true

-	HeaderFilterRegex: '.*' # Default in v22.1.0+
+	HeaderFilterRegex: '.*' # Default in 22.1.0+

CMake/FindZstd.cmake+2 -2

@@ -54,7 +54,7 @@ if(NOT DEFINED ZSTD_INCLUDE_DIR AND
	endif()
	if(NOT _zstd_FOUND AND CURL_USE_CMAKECONFIG)
	find_package(zstd CONFIG QUIET)
-	# Skip using if older than v1.4.5
+	# Only use if 1.4.5 or greater
	if(zstd_CONFIG AND
	NOT TARGET zstd::libzstd_static AND
	NOT TARGET zstd::libzstd_shared)
@@ -81,7 +81,7 @@ elseif(zstd_CONFIG)
	if(ZSTD_USE_STATIC_LIBS)
	set(_zstd_LIBRARIES zstd::libzstd_static)
	elseif(TARGET zstd::libzstd)
-	set(_zstd_LIBRARIES zstd::libzstd) # v1.5.6+
+	set(_zstd_LIBRARIES zstd::libzstd) # 1.5.6+
	else()
	set(_zstd_LIBRARIES zstd::libzstd_shared)
	endif()

CMake/Macros.cmake+1 -1

@@ -255,7 +255,7 @@ macro(curl_collect_target_link_options _target)
	get_target_property(_val ${_target} IMPORTED)
	if(_val)
	# LOCATION is empty for interface library targets and safe to ignore.
-	# Explicitly skip this query to avoid CMake v3.18 and older erroring out.
+	# Explicitly skip this query to avoid CMake 3.18 and older erroring out.
	get_target_property(_val ${_target} TYPE)
	if(NOT "${_val}" STREQUAL "INTERFACE_LIBRARY")
	get_target_property(_val ${_target} LOCATION)

CMake/PickyWarnings.cmake+1 -1

@@ -97,7 +97,7 @@ if(PICKY_COMPILER)
	# to suppress undesired warnings in case -Weverything is passed as a custom option.

	# Assume these options always exist with both clang and gcc.
-	# Require clang 3.0 / gcc 2.95 or later.
+	# Require clang 3.0 / gcc 2.95 or greater.
	list(APPEND _picky_enable
	-Wbad-function-cast # clang 2.7 gcc 2.95
	-Wconversion # clang 2.7 gcc 2.95

CMake/curl-config.in.cmake+1 -1

@@ -30,7 +30,7 @@ option(CURL_USE_PKGCONFIG "Enable pkg-config to detect @PROJECT_NAME@ dependenci

	if(CMAKE_VERSION VERSION_LESS @CMAKE_MINIMUM_REQUIRED_VERSION@)
	message(STATUS "@PROJECT_NAME@: @PROJECT_NAME@-specific Find modules require "
-	"CMake @CMAKE_MINIMUM_REQUIRED_VERSION@ or upper, found: ${CMAKE_VERSION}.")
+	"CMake @CMAKE_MINIMUM_REQUIRED_VERSION@ or greater, found: ${CMAKE_VERSION}.")
	endif()

	include(CMakeFindDependencyMacro)

CMake/unix-cache.cmake+4 -4

@@ -73,9 +73,9 @@ if(ANDROID AND ANDROID_PLATFORM_LEVEL GREATER_EQUAL 34)
	set(HAVE_MEMSET_EXPLICIT 1)
	endif()
	if((APPLE AND CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.9) OR
-	CMAKE_SYSTEM_NAME STREQUAL "DragonFlyBSD" OR # v6+
-	CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR # v11.2+
-	CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD") # v1.3+
+	CMAKE_SYSTEM_NAME STREQUAL "DragonFlyBSD" OR # 6+
+	CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR # 11.2+
+	CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD") # 1.3+
	set(HAVE_MEMSET_S 1)
	elseif(NOT APPLE)
	set(HAVE_MEMSET_S 0)
@@ -260,7 +260,7 @@ set(HAVE_STRINGS_H 1)
	if(_CURL_OLD_LINUX)
	set(HAVE_STROPTS_H 1)
	else()
-	set(HAVE_STROPTS_H 0) # glibc 2.30 or newer. https://sourceware.org/legacy-ml/libc-alpha/2019-08/msg00029.html
+	set(HAVE_STROPTS_H 0) # glibc 2.30 or greater. https://sourceware.org/legacy-ml/libc-alpha/2019-08/msg00029.html
	endif()
	set(HAVE_STRUCT_SOCKADDR_STORAGE 1)
	set(HAVE_STRUCT_TIMEVAL 1)

CMakeLists.txt+8 -8

@@ -68,7 +68,7 @@ project(CURL

	# CMake does not recognize some targets accurately. Touch up configuration manually as a workaround.
	if(WINDOWS_STORE AND MINGW) # MinGW UWP build
-	# CMake (as of v3.31.2) gets confused and applies the MSVC rc.exe command-line
+	# CMake (as of 3.31.2) gets confused and applies the MSVC rc.exe command-line
	# template to windres. Reset it to the windres template as in 'Modules/Platform/Windows-windres.cmake':
	set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff <DEFINES> <INCLUDES> <FLAGS> <SOURCE> <OBJECT>")
	elseif(DOS AND CMAKE_C_COMPILER_ID STREQUAL "GNU") # DJGPP
@@ -230,7 +230,7 @@ if(WIN32)
	if(MINGW64_VERSION)
	message(STATUS "Found MINGW64_VERSION=${MINGW64_VERSION}")
	if(MINGW64_VERSION VERSION_LESS 3.0)
-	message(FATAL_ERROR "mingw-w64 3.0 or upper is required")
+	message(FATAL_ERROR "mingw-w64 3.0 or greater required")
	endif()
	endif()
	endif()
@@ -895,7 +895,7 @@ endif()
	if(CURL_USE_MBEDTLS)
	find_package(MbedTLS MODULE REQUIRED)
	if(MBEDTLS_VERSION VERSION_LESS 3.2.0)
-	message(FATAL_ERROR "mbedTLS v3.2.0 or newer is required.")
+	message(FATAL_ERROR "mbedTLS 3.2.0 or greater required.")
	endif()
	set(_ssl_enabled ON)
	set(USE_MBEDTLS ON)
@@ -929,7 +929,7 @@ if(CURL_USE_WOLFSSL)
	set(_curl_ca_bundle_supported TRUE)

	if(USE_OPENSSL AND WOLFSSL_VERSION VERSION_LESS 5.7.6)
-	message(FATAL_ERROR "wolfSSL 5.7.6 or newer is required to coexist with OpenSSL.")
+	message(FATAL_ERROR "wolfSSL 5.7.6 or greater required to coexist with OpenSSL.")
	endif()

	set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "WOLFSSL_OPTIONS_IGNORE_SYS")
@@ -966,7 +966,7 @@ if(CURL_USE_RUSTLS)
	endif()
	endif()
	if(NOT HAVE_RUSTLS_SUPPORTED_HPKE)
-	message(FATAL_ERROR "rustls-ffi library does not provide rustls_supported_hpke function. Required version is 0.15 or newer.")
+	message(FATAL_ERROR "rustls-ffi library does not provide rustls_supported_hpke function. Required version is 0.15 or greater.")
	endif()

	if(CURL_DEFAULT_SSL_BACKEND AND CURL_DEFAULT_SSL_BACKEND STREQUAL "rustls")
@@ -1005,7 +1005,7 @@ if(ZSTD_FOUND)
	set(HAVE_ZSTD ON)
	list(APPEND CURL_LIBS CURL::zstd)
	else()
-	message(WARNING "zstd v1.0.0 or newer is required, disabling zstd support.")
+	message(WARNING "zstd 1.0.0 or greater required, disabling zstd support.")
	endif()
	endif()

@@ -1027,7 +1027,7 @@ macro(curl_openssl_check_exists)
	if(HAVE_LIBZ)
	list(APPEND CMAKE_REQUIRED_LIBRARIES ZLIB::ZLIB) # Public wolfSSL headers also require zlib headers
	endif()
-	list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DHAVE_UINTPTR_T") # to pull in stdint.h (as of wolfSSL v5.5.4)
+	list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DHAVE_UINTPTR_T") # to pull in stdint.h (as of wolfSSL 5.5.4)
	endif()
	if(WIN32)
	list(APPEND CMAKE_REQUIRED_LIBRARIES "ws2_32" "crypt32") # for OpenSSL/wolfSSL
@@ -1147,7 +1147,7 @@ if(USE_NGTCP2)
	elseif(OPENSSL_VERSION VERSION_GREATER_EQUAL 3.5.0)
	find_package(NGTCP2 MODULE REQUIRED COMPONENTS "ossl")
	if(NGTCP2_VERSION VERSION_LESS 1.12.0)
-	message(FATAL_ERROR "ngtcp2 1.12.0 or upper required for OpenSSL")
+	message(FATAL_ERROR "ngtcp2 1.12.0 or greater required for OpenSSL")
	endif()
	set(OPENSSL_QUIC_API2 1)
	elseif(HAVE_LIBRESSL)

configure.ac+1 -1

@@ -2495,7 +2495,7 @@ if test "x$OPT_LIBSSH2" != "xno"; then
	CPPFLAGS="$CPPFLAGS $CPP_SSH2"
	LIBS="$LIB_SSH2 $LIBS"

-	dnl check for function added in libssh2 v1.9.0
+	dnl check for function added in libssh2 1.9.0
	AC_CHECK_LIB(ssh2, libssh2_agent_get_identity_path)

	AC_CHECK_HEADER(libssh2.h,

docs/HTTPSRR.md+1 -1

@@ -65,7 +65,7 @@ returned, curl parses it and stores the retrieved information.

	If DoH is not used for name resolving in an HTTPS RR enabled build, we must
	provide the ability using the regular resolver backends. We use the c-ares DNS
-	library for the HTTPS RR lookup. Version 1.28.0 or later.
+	library for the HTTPS RR lookup. Version 1.28.0 or greater.

	### c-ares

docs/INSTALL-CMAKE.md+4 -4

@@ -46,7 +46,7 @@ For the full list of CMake build configuration variables see
	### Build system generator selection

	You can override CMake's default by using `-G <generator-name>`. For example
-	on Windows with multiple build systems if you have MinGW-w64 then you could use
+	on Windows with multiple build systems if you have mingw-w64 then you could use
	`-G "MinGW Makefiles"`.
	[List of generator names](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html).

@@ -227,7 +227,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
	- `IMPORT_LIB_SUFFIX`: Import library suffix. Default: `_imp` for MSVC-like toolchains, otherwise empty.
	- `LIBCURL_OUTPUT_NAME`: Basename of the curl library. Default: `libcurl`
	- `PICKY_COMPILER`: Enable picky compiler options. Default: `ON`
-	- `SHARE_LIB_OBJECT`: Build shared and static libcurl in a single pass (requires CMake 3.12 or newer). Default: `ON` for Windows
+	- `SHARE_LIB_OBJECT`: Build shared and static libcurl in a single pass. Default: `ON` for Windows
	- `STATIC_LIB_SUFFIX`: Static library suffix. Default: (empty)

	## Root CA options
@@ -387,7 +387,7 @@ Details via CMake
	- `ZLIB_INCLUDE_DIR`: Absolute path to zlib include directory.
	- `ZLIB_LIBRARY`: Absolute path to `zlib` library.
	- `ZLIB_ROOT`: Absolute path to the installation root of zlib.
-	- `ZLIB_USE_STATIC_LIBS`: Look for static `zlib` library (requires CMake v3.24).
+	- `ZLIB_USE_STATIC_LIBS`: Look for static `zlib` library (requires CMake 3.24+).
	- `<PackageName>_DIR`: Absolute path to `<PackageName>` CMake Config directory where `*.cmake` files reside.
	Used when `CURL_USE_CMAKECONFIG` is enabled.
	`<PackageName>` may be:
@@ -590,7 +590,7 @@ We recommend using CMake to build curl with MSVC.
	The project build files reside in project/Windows/VC\* for VS2010, VS2012 and
	VS2013.

-	These CMake Visual Studio generators require CMake v3.24 or older. You can
+	These CMake Visual Studio generators require CMake 3.24 or older. You can
	download them from <https://cmake.org/files/v3.24/>.

	You can also use `-G "NMake Makefiles"`, which is supported by all CMake

docs/INSTALL.md+3 -3

@@ -224,8 +224,8 @@ Building for Windows Vista/Server 2008 is required as a minimum.

	You can build curl with:

-	- Microsoft Visual Studio 2010 v10.0 or later (`_MSC_VER >= 1600`)
-	- MinGW-w64 3.0 or later (`__MINGW64_VERSION_MAJOR >= 3`)
+	- Microsoft Visual Studio 2010 10.0 or greater (`_MSC_VER >= 1600`)
+	- mingw-w64 3.0 or greater (`__MINGW64_VERSION_MAJOR >= 3`)

	## Building Windows DLLs and C runtime (CRT) linkage issues

@@ -352,7 +352,7 @@ cmake . \

	Notes:

-	- Requires DJGPP 2.04 or upper.
+	- Requires DJGPP 2.04 or greater.

	- Compile Watt-32 (and OpenSSL) with the same version of DJGPP. Otherwise
	things go wrong because things like FS-extensions and `errno` values have

lib/content_encoding.c+1 -1

@@ -65,7 +65,7 @@
	#ifdef HAVE_LIBZ

	#if !defined(ZLIB_VERNUM) \|\| (ZLIB_VERNUM < 0x1252)
-	#error "requires zlib 1.2.5.2 or newer"
+	#error "zlib 1.2.5.2 or greater required"
	#endif

	typedef enum {

lib/curl_ntlm_core.c+1 -1

@@ -76,7 +76,7 @@
	#elif defined(USE_MBEDTLS) && defined(HAVE_MBEDTLS_DES_CRYPT_ECB)
	# include <mbedtls/version.h>
	# if MBEDTLS_VERSION_NUMBER < 0x03020000
-	# error "mbedTLS 3.2.0 or later required"
+	# error "mbedTLS 3.2.0 or greater required"
	# endif
	# include <mbedtls/des.h>
	# define USE_MBEDTLS_DES

lib/curl_setup.h+6 -6

@@ -77,7 +77,7 @@

	#if defined(__MINGW32__) && \
	(!defined(__MINGW64_VERSION_MAJOR) \|\| (__MINGW64_VERSION_MAJOR < 3))
-	#error "Building curl requires mingw-w64 3.0 or later"
+	#error "mingw-w64 3.0 or greater required"
	#endif

	/* Visual Studio 2010 is the minimum Visual Studio version we support.
@@ -178,7 +178,7 @@

	#ifdef HAVE_LIBZ
	# ifndef ZLIB_CONST
-	# define ZLIB_CONST /* Use z_const. Supported by v1.2.5.2 and upper. */
+	# define ZLIB_CONST /* Use z_const. Supported by v1.2.5.2 or greater. */
	# endif
	#endif

@@ -1642,11 +1642,11 @@ typedef struct sockaddr_un {
	(defined(__NEWLIB__) && !defined(__CLIB2__)) \|\| \
	(defined(__GLIBC__) && \
	(__GLIBC__ > 2 \|\| (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 25))) \|\| \
-	(defined(__DragonFly__) && __DragonFly_version >= 500600 /* v5.6+ */) \|\| \
-	(defined(__FreeBSD__) && __FreeBSD_version >= 1100037 /* v11.0+ */) \|\| \
-	(defined(__OpenBSD__) && OpenBSD >= 201405 /* v5.5+ */)
+	(defined(__DragonFly__) && __DragonFly_version >= 500600 /* 5.6+ */) \|\| \
+	(defined(__FreeBSD__) && __FreeBSD_version >= 1100037 /* 11.0+ */) \|\| \
+	(defined(__OpenBSD__) && OpenBSD >= 201405 /* 5.5+ */)
	#define curlx_memzero_low(buf, size) explicit_bzero(buf, size)
-	#elif defined(__NetBSD__) && __NetBSD_Version__ >= 702000000 /* v7.2+ */
+	#elif defined(__NetBSD__) && __NetBSD_Version__ >= 702000000 /* 7.2+ */
	#define curlx_memzero_low(buf, size) (void)explicit_memset(buf, 0, size)
	#endif
	#endif /* !_CURL_LOCAL_MEMZERO */

lib/md5.c+1 -1

@@ -40,7 +40,7 @@
	#ifdef USE_MBEDTLS
	#include <mbedtls/version.h>
	#if MBEDTLS_VERSION_NUMBER < 0x03020000
-	#error "mbedTLS 3.2.0 or later required"
+	#error "mbedTLS 3.2.0 or greater required"
	#endif
	#include <psa/crypto_config.h>
	#endif

lib/sha256.c+1 -1

@@ -32,7 +32,7 @@
	#ifdef USE_MBEDTLS
	#include <mbedtls/version.h>
	#if MBEDTLS_VERSION_NUMBER < 0x03020000
-	#error "mbedTLS 3.2.0 or later required"
+	#error "mbedTLS 3.2.0 or greater required"
	#endif
	#include <psa/crypto_config.h>
	#endif

lib/vauth/gsasl.c+1 -1

@@ -33,7 +33,7 @@
	#include <gsasl.h>

	#if GSASL_VERSION_NUMBER < 0x010600
-	#error "requires libgsasl 1.6.0+"
+	#error "libgsasl 1.6.0 or greater required"
	#endif

	bool Curl_auth_gsasl_is_supported(struct Curl_easy *data,

lib/vdns/asyn-ares.c+2 -2

@@ -61,12 +61,12 @@
	#include <ares.h>

	#if ARES_VERSION < 0x011000
-	#error "requires c-ares 1.16.0 or newer"
+	#error "c-ares 1.16.0 or greater required"
	#endif

	#ifdef USE_HTTPSRR
	#if ARES_VERSION < 0x011c00
-	#error "requires c-ares 1.28.0 or newer for HTTPSRR"
+	#error "c-ares 1.28.0 or greater required for HTTPSRR"
	#endif
	#define HTTPSRR_WORKS
	#endif

lib/vdns/asyn-base.c+1 -1

@@ -71,7 +71,7 @@ timediff_t Curl_async_timeleft_ms(struct Curl_easy *data,
	#ifdef USE_ARES

	#if ARES_VERSION < 0x011000
-	#error "requires c-ares 1.16.0 or newer"
+	#error "c-ares 1.16.0 or greater required"
	#endif

	/*

lib/vssh/ssh.h+1 -1

@@ -220,7 +220,7 @@ struct ssh_conn {

	#ifdef USE_LIBSSH
	#if LIBSSH_VERSION_INT < SSH_VERSION_INT(0, 9, 0)
-	#error "SCP/SFTP protocols require libssh 0.9.0 or later"
+	#error "SCP/SFTP protocols require libssh 0.9.0 or greater"
	#endif
	#endif

lib/vtls/mbedtls.c+1 -1

@@ -36,7 +36,7 @@

	#include <mbedtls/version.h>
	#if MBEDTLS_VERSION_NUMBER < 0x03020000
-	#error "mbedTLS 3.2.0 or later required"
+	#error "mbedTLS 3.2.0 or greater required"
	#endif
	#include <psa/crypto_config.h>
	#include <mbedtls/net_sockets.h>

lib/vtls/openssl.c+2 -2

@@ -87,11 +87,11 @@
	#ifdef LIBRESSL_VERSION_NUMBER
	/* As of LibreSSL 2.0.0-4.0.0: OPENSSL_VERSION_NUMBER == 0x20000000L */
	# if LIBRESSL_VERSION_NUMBER < 0x2090100fL /* 2019-04-13 */
-	# error "LibreSSL 2.9.1 or later required"
+	# error "LibreSSL 2.9.1 or greater required"
	# endif
	#elif !defined(HAVE_BORINGSSL_LIKE)
	# ifndef HAVE_OPENSSL3 /* 2021-09-07 */
-	# error "OpenSSL 3.0.0 or later required"
+	# error "OpenSSL 3.0.0 or greater required"
	# endif
	#endif

lib/vtls/schannel.c+5 -5

@@ -122,7 +122,7 @@
	/* ALPN requires version 8.1 of the Windows SDK, which was
	shipped with Visual Studio 2013, aka _MSC_VER 1800:
	https://learn.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831771
-	Or mingw-w64 9.0 or upper. */
+	Or mingw-w64 9.0+ */
	#if (defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR >= 9) \|\| \
	(defined(_MSC_VER) && (_MSC_VER >= 1800) && !defined(_USING_V110_SDK71_))
	#define HAS_ALPN_SCHANNEL
@@ -184,7 +184,7 @@ static CURLcode schannel_set_ssl_version_min_max(DWORD *enabled_protocols,
	break;
	case CURL_SSLVERSION_TLSv1_3:

-	/* Windows Server 2022 and newer */
+	/* Windows Server 2022 or newer */
	if(curlx_verify_windows_version(10, 0, 20348, PLATFORM_WINNT,
	VERSION_GREATER_THAN_EQUAL)) {
	*enabled_protocols \|= SP_PROT_TLS1_3_CLIENT;
@@ -502,7 +502,7 @@ static CURLcode get_client_cert(struct Curl_cfilter *cf,
	}

	/* CERT_FIND_HAS_PRIVATE_KEY is only available in Windows 8 / Server
-	2012, (NT v6.2). For earlier versions we use CURL_FIND_ANY. */
+	2012, (NT 6.2). For older versions we use CURL_FIND_ANY. */
	if(curlx_verify_windows_version(6, 2, 0, PLATFORM_WINNT,
	VERSION_GREATER_THAN_EQUAL))
	cert_find_flags = CERT_FIND_HAS_PRIVATE_KEY;
@@ -2605,13 +2605,13 @@ static int schannel_init(void)
	if(p_wine_get_version) { /* WINE detected */
	curl_off_t ver = 0;
	const char wine_version = p_wine_get_version(); / e.g. "6.0.2" */
-	/* Assume ALPN support with WINE 6.0 or upper */
+	/* Assume ALPN support with WINE 6.0 or greater */
	if(wine_version)
	curlx_str_number(&wine_version, &ver, 20);
	s_win_has_alpn = (ver >= 6);
	}
	else {
-	/* ALPN is supported on Windows 8.1 / Server 2012 R2 and above. */
+	/* ALPN is supported on Windows 8.1 / Server 2012 R2 or newer. */
	s_win_has_alpn = curlx_verify_windows_version(6, 3, 0, PLATFORM_WINNT,
	VERSION_GREATER_THAN_EQUAL);
	}

lib/vtls/wolfssl.c+2 -2

@@ -34,10 +34,10 @@
	#include <wolfssl/version.h>

	#if LIBWOLFSSL_VERSION_HEX < 0x05000000 /* wolfSSL 5.0.0 (2021-11-01) */
-	#error "wolfSSL version should be at least 5.0.0"
+	#error "wolfSSL 5.0.0 or greater required"
	#endif
	#if defined(OPENSSL_COEXIST) && LIBWOLFSSL_VERSION_HEX < 0x05007006
-	#error "wolfSSL 5.7.6 or newer is required to coexist with OpenSSL"
+	#error "wolfSSL 5.7.6 or greater required to coexist with OpenSSL"
	#endif

	/* To determine what functions are available we rely on one or both of:

m4/curl-amissl.m4+2 -2

@@ -23,7 +23,7 @@
	#***************************************************************************

	AC_DEFUN([CURL_WITH_AMISSL], [
-	AC_MSG_CHECKING([whether to enable Amiga native SSL/TLS (AmiSSL v5)])
+	AC_MSG_CHECKING([whether to enable Amiga native SSL/TLS (AmiSSL 5)])
	if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then
	if test "x$OPT_AMISSL" != "xno"; then
	ssl_msg=
@@ -36,7 +36,7 @@ if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then
	(OPENSSL_VERSION_NUMBER >= 0x30000000L) && defined(PROTO_AMISSL_H)
	return 0;
	#else
-	#error not AmiSSL v5 / OpenSSL 3
+	#error not AmiSSL 5 / OpenSSL 3
	#endif
	]])
	],[

m4/curl-openssl.m4+2 -2

@@ -277,7 +277,7 @@ if test "x$OPT_OPENSSL" != "xno"; then
	])

	if test "$ssl_msg" = 'OpenSSL'; then
-	AC_MSG_CHECKING([for OpenSSL >= v3])
+	AC_MSG_CHECKING([for OpenSSL >= 3])
	AC_COMPILE_IFELSE([
	AC_LANG_PROGRAM([[
	#include <openssl/opensslv.h>
@@ -289,7 +289,7 @@ if test "x$OPT_OPENSSL" != "xno"; then
	#endif
	]])
	],[],[
-	AC_MSG_ERROR([OpenSSL 3.0.0 or later required.])
+	AC_MSG_ERROR([OpenSSL 3.0.0 or greater required.])
	])
	fi
	fi

tests/certs/genserv.pl+1 -1

@@ -32,7 +32,7 @@ use IPC::Open3;
	use Symbol 'gensym';

	sub opensslfail {
-	die "Missing or broken 'openssl' tool. openssl 1.0.2+ is required. ".
+	die "Missing or unsupported 'openssl' tool. openssl 1.0.2+ required. ".
	"Without it, this script cannot generate the necessary certificates ".
	"the curl test suite needs for all its TLS related tests.";
	}