From bb8af1cac5ecd18a26f1614d72da555166df2c46 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Fri, 18 Feb 2022 09:18:49 -0800 Subject: [PATCH] Prepare for release 5.2.0 1. Update versions as appropriate. 2. Modify FreeAtomicUser() to only free the Aes data in the callback contexts if the contexts exist. --- CMakeLists.txt | 8 ++++---- configure.ac | 4 ++-- rpm/spec.in | 8 ++++++-- wolfssl.rc | Bin 4918 -> 4918 bytes wolfssl/test.h | 15 +++++++++------ wolfssl/version.h | 4 ++-- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e36977dfa..68b8a8df8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,16 +28,16 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") You must delete them, or cmake will refuse to work.") endif() -project(wolfssl VERSION 5.1.2 LANGUAGES C ASM) +project(wolfssl VERSION 5.2.0 LANGUAGES C ASM) # shared library versioning # increment if interfaces have been added, removed or changed -set(LIBTOOL_CURRENT 31) +set(LIBTOOL_CURRENT 32) # increment if source code has changed set to zero if current is incremented -set(LIBTOOL_REVISION 2) +set(LIBTOOL_REVISION 0) # increment if interfaces have been added set to zero if interfaces have been # removed or changed -set(LIBTOOL_AGE 1) +set(LIBTOOL_AGE 0) math(EXPR LIBTOOL_SO_VERSION "${LIBTOOL_CURRENT} - ${LIBTOOL_AGE}") set(LIBTOOL_FULL_VERSION ${LIBTOOL_SO_VERSION}.${LIBTOOL_AGE}.${LIBTOOL_REVISION}) diff --git a/configure.ac b/configure.ac index 08a1f2ca9..92d9f4c32 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # AC_COPYRIGHT([Copyright (C) 2006-2020 wolfSSL Inc.]) AC_PREREQ([2.69]) -AC_INIT([wolfssl],[5.1.2],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[https://www.wolfssl.com]) +AC_INIT([wolfssl],[5.2.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[https://www.wolfssl.com]) AC_CONFIG_AUX_DIR([build-aux]) # The following sets CFLAGS to empty if unset on command line. We do not @@ -38,7 +38,7 @@ LT_INIT([disable-static win32-dll]) AC_ARG_VAR(EXTRA_CFLAGS, [Extra CFLAGS to add to autoconf-computed arg list. Can also supply directly to make.]) #shared library versioning -WOLFSSL_LIBRARY_VERSION=31:2:1 +WOLFSSL_LIBRARY_VERSION=32:0:0 # | | | # +------+ | +---+ # | | | diff --git a/rpm/spec.in b/rpm/spec.in index 4ae217985..e4c871f92 100644 --- a/rpm/spec.in +++ b/rpm/spec.in @@ -73,8 +73,8 @@ mkdir -p $RPM_BUILD_ROOT/ %{_docdir}/wolfssl/README.txt %{_libdir}/libwolfssl.la %{_libdir}/libwolfssl.so -%{_libdir}/libwolfssl.so.30 -%{_libdir}/libwolfssl.so.30.1.2 +%{_libdir}/libwolfssl.so.32 +%{_libdir}/libwolfssl.so.32.0.0 %files devel %defattr(-,root,root,-) @@ -201,6 +201,7 @@ mkdir -p $RPM_BUILD_ROOT/ %{_includedir}/wolfssl/openssl/engine.h %{_includedir}/wolfssl/openssl/err.h %{_includedir}/wolfssl/openssl/evp.h +%{_includedir}/wolfssl/openssl/fips_rand.h %{_includedir}/wolfssl/openssl/hmac.h %{_includedir}/wolfssl/openssl/lhash.h %{_includedir}/wolfssl/openssl/md4.h @@ -295,6 +296,7 @@ mkdir -p $RPM_BUILD_ROOT/ %{_includedir}/wolfssl/wolfcrypt/sha256.h %{_includedir}/wolfssl/wolfcrypt/sha3.h %{_includedir}/wolfssl/wolfcrypt/sha512.h +%{_includedir}/wolfssl/wolfcrypt/siphash.h %{_includedir}/wolfssl/wolfcrypt/signature.h %{_includedir}/wolfssl/wolfcrypt/srp.h %{_includedir}/wolfssl/wolfcrypt/tfm.h @@ -308,6 +310,8 @@ mkdir -p $RPM_BUILD_ROOT/ %{_libdir}/pkgconfig/wolfssl.pc %changelog +* Wed Feb 16 2022 John Safranek +- Update for new release. * Mon Dec 27 2021 Jacob Barthelmeh - Add a missing headers camellia.h, modes.h from compat layer. - Add a missing header falcon.h. diff --git a/wolfssl.rc b/wolfssl.rc index 3cf49c57c8356dd30c43aa8ba1c238cbbb7f71a9..4df442a786dd0d122125c776b6b73edba08650d8 100644 GIT binary patch delta 66 zcmdm{woPqA9|x-ugARki|6 diff --git a/wolfssl/test.h b/wolfssl/test.h index 11f1c1f55..7227e2261 100644 --- a/wolfssl/test.h +++ b/wolfssl/test.h @@ -3668,13 +3668,16 @@ static WC_INLINE void FreeAtomicUser(WOLFSSL* ssl) /* Encrypt-Then-MAC callbacks use same contexts. */ - if (encCtx->keySetup == 1) - wc_AesFree(&encCtx->aes); - if (decCtx->keySetup == 1) - wc_AesFree(&decCtx->aes); - + if (encCtx != NULL) { + if (encCtx->keySetup == 1) + wc_AesFree(&encCtx->aes); + free(encCtx); + } + if (decCtx != NULL) { + if (decCtx->keySetup == 1) + wc_AesFree(&decCtx->aes); free(decCtx); - free(encCtx); + } } #endif /* ATOMIC_USER */ diff --git a/wolfssl/version.h b/wolfssl/version.h index b8d800226..e47c86d40 100644 --- a/wolfssl/version.h +++ b/wolfssl/version.h @@ -28,8 +28,8 @@ extern "C" { #endif -#define LIBWOLFSSL_VERSION_STRING "5.1.2" -#define LIBWOLFSSL_VERSION_HEX 0x05001002 +#define LIBWOLFSSL_VERSION_STRING "5.2.0" +#define LIBWOLFSSL_VERSION_HEX 0x05002000 #ifdef __cplusplus }