feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5379 from douzzer/20220720-fixes

Browse Source 
20220720-fixes
This commit is contained in:
JacobBarthelmeh
2022-07-20 21:34:08 -06:00
committed by GitHub
parent 706ab6aac0 542c53f3ac
commit a4e3dc9638
11 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IDE/HEXAGON/DSP/Makefile
View File

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
ENVI=hexagon ENVI=hexagon

2
IDE/HEXAGON/Makefile
View File

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
ENVI=UbuntuARM ENVI=UbuntuARM

3
IDE/MYSQL/CMakeLists_wolfCrypt.txt
View File

@ -17,9 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
#/
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include

3
IDE/MYSQL/CMakeLists_wolfSSL.txt
View File

@ -17,9 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
#/
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include

4
IDE/mynewt/apps.wolfcrypttest.pkg.yml
View File

@ -15,10 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
#/
#
pkg.name: "apps/wolfcrypttest" pkg.name: "apps/wolfcrypttest"
pkg.type: app pkg.type: app

4
IDE/mynewt/crypto.wolfssl.pkg.yml
View File

@ -15,10 +15,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
#/
#
pkg.name: "crypto/wolfssl" pkg.name: "crypto/wolfssl"
pkg.description: "wolfSSL Embedded SSL/TLS Library" pkg.description: "wolfSSL Embedded SSL/TLS Library"

4
configure.ac
View File

@ -7812,8 +7812,8 @@ if test "x$ENABLED_LINUXKM" = "xyes"; then
AC_SUBST([ASFLAGS_FPUSIMD_DISABLE]) AC_SUBST([ASFLAGS_FPUSIMD_DISABLE])
AC_SUBST([ASFLAGS_FPUSIMD_ENABLE]) AC_SUBST([ASFLAGS_FPUSIMD_ENABLE])
if test "$ENABLED_OPENSSLEXTRA" != "no"; then if test "$ENABLED_OPENSSLEXTRA" != "no" && test "$ENABLED_CRYPTONLY" = "no"; then
AC_MSG_ERROR([--enable-opensslextra is incompatible with --enable-linuxkm.]) AC_MSG_ERROR([--enable-opensslextra without --enable-cryptonly is incompatible with --enable-linuxkm.])
fi fi
if test "$ENABLED_FILESYSTEM" = "yes"; then if test "$ENABLED_FILESYSTEM" = "yes"; then
AC_MSG_ERROR([--enable-filesystem is incompatible with --enable-linuxkm.]) AC_MSG_ERROR([--enable-filesystem is incompatible with --enable-linuxkm.])

2
linuxkm/Kbuild
View File

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#
SHELL=/bin/bash SHELL=/bin/bash

2
linuxkm/Makefile
View File

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
SHELL=/bin/bash SHELL=/bin/bash

2
m4/ax_linuxkm.m4
View File

@ -17,8 +17,6 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
#/
#/
AC_DEFUN([AC_PATH_DEFAULT_KERNEL_SOURCE], AC_DEFUN([AC_PATH_DEFAULT_KERNEL_SOURCE],
[ [

8
src/tls13.c
View File

@ -3339,6 +3339,10 @@ int SendTls13ClientHello(WOLFSSL* ssl)
WOLFSSL_START(WC_FUNC_CLIENT_HELLO_SEND); WOLFSSL_START(WC_FUNC_CLIENT_HELLO_SEND);
WOLFSSL_ENTER("SendTls13ClientHello"); WOLFSSL_ENTER("SendTls13ClientHello");
if (ssl == NULL) {
return BAD_FUNC_ARG;
}
ssl->options.buildingMsg = 1; ssl->options.buildingMsg = 1;
major = SSLv3_MAJOR; major = SSLv3_MAJOR;
tls12minor = TLSv1_2_MINOR; tls12minor = TLSv1_2_MINOR;
@ -3350,10 +3354,6 @@ int SendTls13ClientHello(WOLFSSL* ssl)
} }
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
if (ssl == NULL) {
return BAD_FUNC_ARG;
}
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
if (ssl->options.resuming && if (ssl->options.resuming &&
(ssl->session->version.major != ssl->version.major || (ssl->session->version.major != ssl->version.major ||