From 3bebcaaf540eae9cc9463e91df715939750e8ae0 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Tue, 13 Jul 2021 04:18:52 +0700
Subject: [PATCH 1/2] bump version for dev

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0ca6a859..814078365 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.8.0 LANGUAGES C)
+project(wolfssl VERSION 4.8.1 LANGUAGES C)
 
 # shared library versioning
 # increment if interfaces have been added, removed or changed
diff --git a/configure.ac b/configure.ac
index e5404f0fb..89bba24e6 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.8.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[https://www.wolfssl.com])
+AC_INIT([wolfssl],[4.8.1],[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=29:0:5
+WOLFSSL_LIBRARY_VERSION=29:1:5
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |
diff --git a/wolfcrypt/src/port/caam/caam_qnx.c b/wolfcrypt/src/port/caam/caam_qnx.c
index 141131e5d..d7e9908d4 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.8.0\n"
+        "wolfCrypt QNX CAAM driver version 4.8.1\n"
         "Supports:\n"
         "\tAES-CMAC\n"
         "\tECC (sign, verify, ecdh, keygen)\n"
diff --git a/wolfssl.rc b/wolfssl.rc
index c63ca8302380c9c4d900c5427b3b466478dfd6aa..3e6985c8dde33a92f93e788e636b9def8f1307c8 100644
GIT binary patch
delta 41
xcmdm{woPrrBo0Qy$&)z@84Wid<p^bAG~6uB`<9W>aI!S7^kg%Bp~YtWEC3Nb3wQtk

delta 41
xcmdm{woPrrBo0P{$&)z@84Wfc<p^bAG}tW7`<9W>V6rr?^kg%Bp~YtWEC3MT3v>Vg

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

From 3f22721a8666935b25f1e33dd6dfa3f4f53260f7 Mon Sep 17 00:00:00 2001
From: Jacob Barthelmeh <jacob@wolfssl.com>
Date: Tue, 13 Jul 2021 22:39:39 +0700
Subject: [PATCH 2/2] use version from wolfssl/version.h with driver

---
 IDE/QNX/CAAM-DRIVER/Makefile       | 2 +-
 wolfcrypt/src/port/caam/caam_qnx.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/IDE/QNX/CAAM-DRIVER/Makefile b/IDE/QNX/CAAM-DRIVER/Makefile
index 5e08b4724..27a9563cc 100644
--- a/IDE/QNX/CAAM-DRIVER/Makefile
+++ b/IDE/QNX/CAAM-DRIVER/Makefile
@@ -9,7 +9,7 @@ CC = qcc -Vgcc_nto$(PLATFORM)
 CXX = qcc -lang-c++ -Vgcc_nto$(PLATFORM)
 LD = $(CC)
 
-INCLUDES += -I../../../wolfssl/wolfcrypt/port/caam/
+INCLUDES += -I../../../ -I../../../wolfssl/wolfcrypt/port/caam/
 CCFLAGS += -O2 -Wall
 
 SRCS = \
diff --git a/wolfcrypt/src/port/caam/caam_qnx.c b/wolfcrypt/src/port/caam/caam_qnx.c
index d7e9908d4..8b436040c 100644
--- a/wolfcrypt/src/port/caam/caam_qnx.c
+++ b/wolfcrypt/src/port/caam/caam_qnx.c
@@ -20,6 +20,7 @@
  */
 
 #include "caam_driver.h"
+#include "wolfssl/version.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -1190,8 +1191,9 @@ static int getSupported(char* in)
 #endif
 
 char cannedResponse[] = {
-        "wolfCrypt QNX CAAM driver version 4.8.1\n"
-        "Supports:\n"
+        "wolfCrypt QNX CAAM driver version "
+        LIBWOLFSSL_VERSION_STRING
+        "\nSupports:\n"
         "\tAES-CMAC\n"
         "\tECC (sign, verify, ecdh, keygen)\n"
         "\tBlobs (black and red)\n"