From 500a6c8b276903d977a6b5763fc18d3dd6614834 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Thu, 8 Jul 2021 12:02:40 -0600
Subject: [PATCH] prepare for release 4.8.0

---
 CMakeLists.txt                     |   2 +-
 configure.ac                       |   4 ++--
 rpm/spec.in                        |   6 +++++-
 wolfcrypt/src/port/caam/caam_qnx.c |   2 +-
 wolfssl.rc                         | Bin 4918 -> 4918 bytes
 wolfssl/version.h                  |   4 ++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9bfbc3c5..f0ca6a859 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
      You must delete them, or cmake will refuse to work.")
 endif()
 
-project(wolfssl VERSION 4.7.1 LANGUAGES C)
+project(wolfssl VERSION 4.8.0 LANGUAGES C)
 
 # shared library versioning
 # increment if interfaces have been added, removed or changed
diff --git a/configure.ac b/configure.ac
index f752b42d6..e5404f0fb 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],[4.7.1],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[https://www.wolfssl.com])
+AC_INIT([wolfssl],[4.8.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
@@ -36,7 +36,7 @@ LT_PREREQ([2.4.2])
 LT_INIT([disable-static win32-dll])
 
 #shared library versioning
-WOLFSSL_LIBRARY_VERSION=28:1:4
+WOLFSSL_LIBRARY_VERSION=29:0:5
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
diff --git a/rpm/spec.in b/rpm/spec.in
index 53788f307..5d26095f7 100644
--- a/rpm/spec.in
+++ b/rpm/spec.in
@@ -74,7 +74,7 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_libdir}/libwolfssl.la
 %{_libdir}/libwolfssl.so
 %{_libdir}/libwolfssl.so.24
-%{_libdir}/libwolfssl.so.24.4.0
+%{_libdir}/libwolfssl.so.24.5.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -256,6 +256,7 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_includedir}/wolfssl/wolfcrypt/dh.h
 %{_includedir}/wolfssl/wolfcrypt/dsa.h
 %{_includedir}/wolfssl/wolfcrypt/ecc.h
+%{_includedir}/wolfssl/wolfcrypt/eccsi.h
 %{_includedir}/wolfssl/wolfcrypt/ed25519.h
 %{_includedir}/wolfssl/wolfcrypt/ed448.h
 %{_includedir}/wolfssl/wolfcrypt/error-crypt.h
@@ -287,6 +288,7 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_includedir}/wolfssl/wolfcrypt/ripemd.h
 %{_includedir}/wolfssl/wolfcrypt/rc2.h
 %{_includedir}/wolfssl/wolfcrypt/rsa.h
+%{_includedir}/wolfssl/wolfcrypt/sakke.h
 %{_includedir}/wolfssl/wolfcrypt/settings.h
 %{_includedir}/wolfssl/wolfcrypt/sha.h
 %{_includedir}/wolfssl/wolfcrypt/sha256.h
@@ -305,6 +307,8 @@ mkdir -p $RPM_BUILD_ROOT/
 %{_libdir}/pkgconfig/wolfssl.pc
 
 %changelog
+* Thu Jul 08 2021 Jacob Barthelmeh <jacob@wolfssl.com>
+- Add a missing header eccsi, sakke.
 * Mon Aug 17 2020 John Safranek <john@wolfssl.com>
 - Add a missing header.
 - Update for release.
diff --git a/wolfcrypt/src/port/caam/caam_qnx.c b/wolfcrypt/src/port/caam/caam_qnx.c
index d9df12e2e..141131e5d 100644
--- a/wolfcrypt/src/port/caam/caam_qnx.c
+++ b/wolfcrypt/src/port/caam/caam_qnx.c
@@ -1190,7 +1190,7 @@ static int getSupported(char* in)
 #endif
 
 char cannedResponse[] = {
-        "wolfCrypt QNX CAAM driver version 4.7.1 (9)\n"
+        "wolfCrypt QNX CAAM driver version 4.8.0\n"
         "Supports:\n"
         "\tAES-CMAC\n"
         "\tECC (sign, verify, ecdh, keygen)\n"
diff --git a/wolfssl.rc b/wolfssl.rc
index 6ddc1103cd774cc07e3de64939b993f03df18ee8..c63ca8302380c9c4d900c5427b3b466478dfd6aa 100644
GIT binary patch
delta 57
zcmdm{woPqA9|x-igARki<jEYm5Z30S9DyvX77Tg}2AidMUot|Nlcjm3C!6sLEjHt4
F0RW!j4F~`L

delta 57
zcmdm{woPqA9|x;BgARk?<jEYm5Z30S9DyvX<_vlahMT2%Uot|Nlcjm3C!6sLEjHt4
F0RW!T4F~`L

diff --git a/wolfssl/version.h b/wolfssl/version.h
index 84e6d30bf..c75219f1b 100644
--- a/wolfssl/version.h
+++ b/wolfssl/version.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFSSL_VERSION_STRING "4.7.1"
-#define LIBWOLFSSL_VERSION_HEX 0x04007001
+#define LIBWOLFSSL_VERSION_STRING "4.8.0"
+#define LIBWOLFSSL_VERSION_HEX 0x04008000
 
 #ifdef __cplusplus
 }