Merge pull request #4201 from JacobBarthelmeh/Release

bump version for dev

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

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 = \

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
 #                        | | |
 #                 +------+ | +---+
 #                 |        |     |

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.0\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"

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
 }