From fc5fa1bbd405efb5f61bd67c59ab457acfd46a84 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Tue, 26 Oct 2021 19:00:16 -0600 Subject: [PATCH] wolfSSL not WolfSSL --- INSTALL | 2 +- config.h.in | 2 +- configure | 12 ++++++------ configure.ac | 16 ++++++++-------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/INSTALL b/INSTALL index 7646aa807..53442429b 100644 --- a/INSTALL +++ b/INSTALL @@ -644,7 +644,7 @@ Authentication options: the OpenSSL 3.0 package on OpenBSD. Defaults to "%s". --enable-wolfssl[=DIR] - Use WolfSSL's TLS and SHA-2 message digest functions. If + Use wolfSSL's TLS and SHA-2 message digest functions. If specified, DIR should contain the OpenSSL include and lib directories. diff --git a/config.h.in b/config.h.in index 22c6e11ed..1bc16b479 100644 --- a/config.h.in +++ b/config.h.in @@ -1009,7 +1009,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H -/* Define to 1 if you are using WolfSSL's TLS and sha2 functions. */ +/* Define to 1 if you are using wolfSSL's TLS and sha2 functions. */ #undef HAVE_WOLFSSL /* Define to 1 if you have the `wordexp' function. */ diff --git a/configure b/configure index 174f1b64c..bf09a9b6a 100755 --- a/configure +++ b/configure @@ -1764,7 +1764,7 @@ Optional Features: --enable-openssl-pkgconfig-template A printf format string used to construct the OpenSSL pkg-config name - --enable-wolfssl Use WolfSSL's TLS and sha2 functions + --enable-wolfssl Use wolfSSL's TLS and sha2 functions --enable-gcrypt Use GNU crypt's sha2 functions --enable-python Compile python plugin support --enable-shared[=PKGS] build shared libraries [default=yes] @@ -7001,8 +7001,8 @@ if test ${enable_gcrypt+y} then : enableval=$enable_gcrypt; if test "${enable_openssl-no}${enable_wolfssl-no}" != "nono"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring --enable-gcrypt when OpenSSL or WolfSSL is enabled." >&5 -printf "%s\n" "$as_me: WARNING: ignoring --enable-gcrypt when OpenSSL or WolfSSL is enabled." >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring --enable-gcrypt when OpenSSL or wolfSSL is enabled." >&5 +printf "%s\n" "$as_me: WARNING: ignoring --enable-gcrypt when OpenSSL or wolfSSL is enabled." >&2;} enable_gcrypt=no fi @@ -24394,7 +24394,7 @@ else $as_nop fi - # Use WolfSSL's sha2 functions if possible + # Use wolfSSL's sha2 functions if possible ac_fn_check_decl "$LINENO" "EVP_MD_CTX_new" "ac_cv_have_decl_EVP_MD_CTX_new" " $ac_includes_default #include @@ -24408,7 +24408,7 @@ fi CPPFLAGS="$O_CPPFLAGS" LDFLAGS="$O_LDFLAGS" - # Use pkg-config to determine WolfSSL libs and cflags + # Use pkg-config to determine wolfSSL libs and cflags for f in `$PKG_CONFIG $STATIC --libs wolfssl`; do case "$f" in -L*) @@ -24883,7 +24883,7 @@ fi LIBTLS="${LIBTLS} -lwolfssl" LIBCRYPTO="${LIBCRYPTO} -lwolfssl" - # Use WolfSSL's sha2 functions if possible + # Use wolfSSL's sha2 functions if possible ac_fn_check_decl "$LINENO" "EVP_MD_CTX_new" "ac_cv_have_decl_EVP_MD_CTX_new" " $ac_includes_default #include diff --git a/configure.ac b/configure.ac index 5d0bef902..7b41786cd 100644 --- a/configure.ac +++ b/configure.ac @@ -1561,7 +1561,7 @@ if test X"$LOGSRVD_SRC" != X""; then fi dnl -dnl Do OpenSSL / WolfSSL / gcrypt after logsrv options +dnl Do OpenSSL / wolfSSL / gcrypt after logsrv options dnl AC_ARG_ENABLE(openssl, [AS_HELP_STRING([--enable-openssl], [Use OpenSSL's TLS and sha2 functions])], @@ -1576,14 +1576,14 @@ AC_ARG_ENABLE(openssl-pkgconfig-template, [], [enable_openssl_pkgconfig_template="%s"]) AC_ARG_ENABLE(wolfssl, -[AS_HELP_STRING([--enable-wolfssl], [Use WolfSSL's TLS and sha2 functions])], [ +[AS_HELP_STRING([--enable-wolfssl], [Use wolfSSL's TLS and sha2 functions])], [ enable_openssl=no ]) AC_ARG_ENABLE(gcrypt, [AS_HELP_STRING([--enable-gcrypt], [Use GNU crypt's sha2 functions])], [ if test "${enable_openssl-no}${enable_wolfssl-no}" != "nono"; then - AC_MSG_WARN([ignoring --enable-gcrypt when OpenSSL or WolfSSL is enabled.]) + AC_MSG_WARN([ignoring --enable-gcrypt when OpenSSL or wolfSSL is enabled.]) enable_gcrypt=no fi ]) @@ -3107,7 +3107,7 @@ elif test "${enable_gcrypt-no}" != no; then fi fi dnl -dnl Check for OpenSSL compatibility functions in WolfSSL +dnl Check for OpenSSL compatibility functions in wolfSSL dnl if test "${enable_wolfssl-no}" != no; then # Use pkg-config to find the wolfssl cflags and libs if possible. @@ -3134,7 +3134,7 @@ if test "${enable_wolfssl-no}" != no; then libssl=`echo $libssl | sed 's/ .*//'` AC_CHECK_LIB($libssl, wolfSSL_new, [STATIC=""], [STATIC="--static"], [$libssl_extra]) - # Use WolfSSL's sha2 functions if possible + # Use wolfSSL's sha2 functions if possible AC_CHECK_DECL([EVP_MD_CTX_new], [DIGEST=digest_openssl.lo], [], [ AC_INCLUDES_DEFAULT #include @@ -3143,7 +3143,7 @@ if test "${enable_wolfssl-no}" != no; then CPPFLAGS="$O_CPPFLAGS" LDFLAGS="$O_LDFLAGS" - # Use pkg-config to determine WolfSSL libs and cflags + # Use pkg-config to determine wolfSSL libs and cflags for f in `$PKG_CONFIG $STATIC --libs wolfssl`; do case "$f" in -L*) @@ -3185,7 +3185,7 @@ if test "${enable_wolfssl-no}" != no; then LIBTLS="${LIBTLS} -lwolfssl" LIBCRYPTO="${LIBCRYPTO} -lwolfssl" - # Use WolfSSL's sha2 functions if possible + # Use wolfSSL's sha2 functions if possible AC_CHECK_DECL([EVP_MD_CTX_new], [DIGEST=digest_openssl.lo], [], [ AC_INCLUDES_DEFAULT #include @@ -5400,7 +5400,7 @@ AH_TEMPLATE(HAVE_KINFO_PROC_FREEBSD, [Define to 1 if your system has a FreeBSD-s AH_TEMPLATE(HAVE_KINFO_PROC2_NETBSD, [Define to 1 if your system has a NetBSD-style kinfo_proc2 struct.]) AH_TEMPLATE(HAVE_KINFO_PROC_OPENBSD, [Define to 1 if your system has an OpenBSD-style kinfo_proc struct.]) AH_TEMPLATE(HAVE_OPENSSL, [Define to 1 if you are using OpenSSL's TLS and sha2 functions.]) -AH_TEMPLATE(HAVE_WOLFSSL, [Define to 1 if you are using WolfSSL's TLS and sha2 functions.]) +AH_TEMPLATE(HAVE_WOLFSSL, [Define to 1 if you are using wolfSSL's TLS and sha2 functions.]) AH_TEMPLATE(HAVE_GCRYPT, [Define to 1 if you are using gcrypt's sha2 functions.]) AH_TEMPLATE(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION, [Define to 1 if you have the `SSL_CTX_set_min_proto_version' function or macro.]) AH_TEMPLATE(HAVE_SSL_CTX_SET_CIPHERSUITES, [Define to 1 if you have the `SSL_CTX_set_ciphersuites' function or macro.])