From 38428896499eef55e342b117beec68da98fa7403 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 20 Jul 2022 18:19:58 -0500 Subject: [PATCH 1/3] src/tls13.c: in SendTls13ClientHello(), move nullness check on WOLFSSL* ssl back to the start of the function. --- src/tls13.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tls13.c b/src/tls13.c index 6aa097835..fe09fdba3 100644 --- a/src/tls13.c +++ b/src/tls13.c @@ -3339,6 +3339,10 @@ int SendTls13ClientHello(WOLFSSL* ssl) WOLFSSL_START(WC_FUNC_CLIENT_HELLO_SEND); WOLFSSL_ENTER("SendTls13ClientHello"); + if (ssl == NULL) { + return BAD_FUNC_ARG; + } + ssl->options.buildingMsg = 1; major = SSLv3_MAJOR; tls12minor = TLSv1_2_MINOR; @@ -3350,10 +3354,6 @@ int SendTls13ClientHello(WOLFSSL* ssl) } #endif /* WOLFSSL_DTLS */ - if (ssl == NULL) { - return BAD_FUNC_ARG; - } - #ifdef HAVE_SESSION_TICKET if (ssl->options.resuming && (ssl->session->version.major != ssl->version.major || From a3fd7145015dbb353efaabf4679f0b459d57c256 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 20 Jul 2022 18:21:29 -0500 Subject: [PATCH 2/3] configure.ac: allow --enable-opensslextra with --enable-linuxkm if --enable-cryptonly is also given. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 04530e819..944b04967 100644 --- a/configure.ac +++ b/configure.ac @@ -7812,8 +7812,8 @@ if test "x$ENABLED_LINUXKM" = "xyes"; then AC_SUBST([ASFLAGS_FPUSIMD_DISABLE]) AC_SUBST([ASFLAGS_FPUSIMD_ENABLE]) - if test "$ENABLED_OPENSSLEXTRA" != "no"; then - AC_MSG_ERROR([--enable-opensslextra is incompatible with --enable-linuxkm.]) + if test "$ENABLED_OPENSSLEXTRA" != "no" && test "$ENABLED_CRYPTONLY" = "no"; then + AC_MSG_ERROR([--enable-opensslextra without --enable-cryptonly is incompatible with --enable-linuxkm.]) fi if test "$ENABLED_FILESYSTEM" = "yes"; then AC_MSG_ERROR([--enable-filesystem is incompatible with --enable-linuxkm.]) From 542c53f3acd552dff0ae5aa28e7c8383d7aab792 Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Wed, 20 Jul 2022 18:23:28 -0500 Subject: [PATCH 3/3] snip out errant "#/" strings added to various text files by copyright boilerplate update in 8eaa85e412. --- IDE/HEXAGON/DSP/Makefile | 2 -- IDE/HEXAGON/Makefile | 2 -- IDE/MYSQL/CMakeLists_wolfCrypt.txt | 3 --- IDE/MYSQL/CMakeLists_wolfSSL.txt | 3 --- IDE/mynewt/apps.wolfcrypttest.pkg.yml | 4 ---- IDE/mynewt/crypto.wolfssl.pkg.yml | 4 ---- linuxkm/Kbuild | 2 -- linuxkm/Makefile | 2 -- m4/ax_linuxkm.m4 | 2 -- 9 files changed, 24 deletions(-) diff --git a/IDE/HEXAGON/DSP/Makefile b/IDE/HEXAGON/DSP/Makefile index b51b5984b..f2c31b57a 100644 --- a/IDE/HEXAGON/DSP/Makefile +++ b/IDE/HEXAGON/DSP/Makefile @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ ENVI=hexagon diff --git a/IDE/HEXAGON/Makefile b/IDE/HEXAGON/Makefile index 9bef5912e..4a9a311b3 100644 --- a/IDE/HEXAGON/Makefile +++ b/IDE/HEXAGON/Makefile @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ ENVI=UbuntuARM diff --git a/IDE/MYSQL/CMakeLists_wolfCrypt.txt b/IDE/MYSQL/CMakeLists_wolfCrypt.txt index 2483d900d..c558bc74f 100644 --- a/IDE/MYSQL/CMakeLists_wolfCrypt.txt +++ b/IDE/MYSQL/CMakeLists_wolfCrypt.txt @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ -#/ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/IDE/MYSQL/CMakeLists_wolfSSL.txt b/IDE/MYSQL/CMakeLists_wolfSSL.txt index e676f2628..4f0eec23b 100644 --- a/IDE/MYSQL/CMakeLists_wolfSSL.txt +++ b/IDE/MYSQL/CMakeLists_wolfSSL.txt @@ -17,9 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ -#/ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include diff --git a/IDE/mynewt/apps.wolfcrypttest.pkg.yml b/IDE/mynewt/apps.wolfcrypttest.pkg.yml index 1ab34af9a..ccc3a70c4 100644 --- a/IDE/mynewt/apps.wolfcrypttest.pkg.yml +++ b/IDE/mynewt/apps.wolfcrypttest.pkg.yml @@ -15,10 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ -#/ -# pkg.name: "apps/wolfcrypttest" pkg.type: app diff --git a/IDE/mynewt/crypto.wolfssl.pkg.yml b/IDE/mynewt/crypto.wolfssl.pkg.yml index 01b747b56..44fa6bf9f 100644 --- a/IDE/mynewt/crypto.wolfssl.pkg.yml +++ b/IDE/mynewt/crypto.wolfssl.pkg.yml @@ -15,10 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ -#/ -# pkg.name: "crypto/wolfssl" pkg.description: "wolfSSL Embedded SSL/TLS Library" diff --git a/linuxkm/Kbuild b/linuxkm/Kbuild index 69620fc2a..f42a07fce 100644 --- a/linuxkm/Kbuild +++ b/linuxkm/Kbuild @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -# SHELL=/bin/bash diff --git a/linuxkm/Makefile b/linuxkm/Makefile index a71420ec8..d0a146a9e 100644 --- a/linuxkm/Makefile +++ b/linuxkm/Makefile @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ SHELL=/bin/bash diff --git a/m4/ax_linuxkm.m4 b/m4/ax_linuxkm.m4 index 4e90d4dba..e494d0693 100644 --- a/m4/ax_linuxkm.m4 +++ b/m4/ax_linuxkm.m4 @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA -#/ -#/ AC_DEFUN([AC_PATH_DEFAULT_KERNEL_SOURCE], [