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

Merge pull request #756 from toddouska/release3-10-3

Browse Source 
3.10.3 rel
This commit is contained in:
JacobBarthelmeh
2017-02-20 10:08:14 -07:00
committed by GitHub
parent 3837173f93 ebb21fc284
commit db1f205522
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -6,7 +6,7 @@
# #
# #
AC_INIT([wolfssl],[3.10.2],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com]) AC_INIT([wolfssl],[3.10.3],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
@@ -35,7 +35,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS. AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
#shared library versioning #shared library versioning
WOLFSSL_LIBRARY_VERSION=10:0:0 WOLFSSL_LIBRARY_VERSION=10:1:0
# | | | # | | |
# +------+ | +---+ # +------+ | +---+
# | | | # | | |

15
fips-check.sh
View File

@@ -11,12 +11,12 @@
# #
# $ ./fips-check [version] # $ ./fips-check [version]
# #
# - version: linux (default), ios, android, windows, freertos # - version: linux (default), ios, android, windows, freertos, linux-ecc
# #
function Usage() { function Usage() {
echo "Usage: $0 [platform]" echo "Usage: $0 [platform]"
echo "Where \"platform\" is one of linux (default), ios, android, windows, freertos, openrtos-3.9.2" echo "Where \"platform\" is one of linux (default), ios, android, windows, freertos, openrtos-3.9.2, linux-ecc"
} }
LINUX_FIPS_VERSION=v3.2.6 LINUX_FIPS_VERSION=v3.2.6
@@ -24,6 +24,11 @@ LINUX_FIPS_REPO=git@github.com:wolfSSL/fips.git
LINUX_CTAO_VERSION=v3.2.6 LINUX_CTAO_VERSION=v3.2.6
LINUX_CTAO_REPO=git@github.com:cyassl/cyassl.git LINUX_CTAO_REPO=git@github.com:cyassl/cyassl.git
LINUX_ECC_FIPS_VERSION=v3.10.3
LINUX_ECC_FIPS_REPO=git@github.com:wolfSSL/fips.git
LINUX_ECC_CTAO_VERSION=v3.2.6
LINUX_ECC_CTAO_REPO=git@github.com:cyassl/cyassl.git
IOS_FIPS_VERSION=v3.4.8a IOS_FIPS_VERSION=v3.4.8a
IOS_FIPS_REPO=git@github.com:wolfSSL/fips.git IOS_FIPS_REPO=git@github.com:wolfSSL/fips.git
IOS_CTAO_VERSION=v3.4.8.fips IOS_CTAO_VERSION=v3.4.8.fips
@@ -95,6 +100,12 @@ linux)
CTAO_VERSION=$LINUX_CTAO_VERSION CTAO_VERSION=$LINUX_CTAO_VERSION
CTAO_REPO=$LINUX_CTAO_REPO CTAO_REPO=$LINUX_CTAO_REPO
;; ;;
linux-ecc)
FIPS_VERSION=$LINUX_ECC_FIPS_VERSION
FIPS_REPO=$LINUX_ECC_FIPS_REPO
CTAO_VERSION=$LINUX_ECC_CTAO_VERSION
CTAO_REPO=$LINUX_ECC_CTAO_REPO
;;
*) *)
Usage Usage
exit 1 exit 1

2
rpm/spec.in
View File

@@ -73,7 +73,7 @@ mkdir -p $RPM_BUILD_ROOT/
%{_libdir}/libwolfssl.la %{_libdir}/libwolfssl.la
%{_libdir}/libwolfssl.so %{_libdir}/libwolfssl.so
%{_libdir}/libwolfssl.so.10 %{_libdir}/libwolfssl.so.10
%{_libdir}/libwolfssl.so.10.0.0 %{_libdir}/libwolfssl.so.10.0.1
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)

2
support/wolfssl.pc
View File

@@ -5,6 +5,6 @@ includedir=${prefix}/include
Name: wolfssl Name: wolfssl
Description: wolfssl C library. Description: wolfssl C library.
Version: 3.10.2 Version: 3.10.3
Libs: -L${libdir} -lwolfssl Libs: -L${libdir} -lwolfssl
Cflags: -I${includedir} Cflags: -I${includedir}

4
wolfssl/version.h
View File

@@ -28,8 +28,8 @@
extern "C" { extern "C" {
#endif #endif
#define LIBWOLFSSL_VERSION_STRING "3.10.2" #define LIBWOLFSSL_VERSION_STRING "3.10.3"
#define LIBWOLFSSL_VERSION_HEX 0x03010002 #define LIBWOLFSSL_VERSION_HEX 0x03010003
#ifdef __cplusplus #ifdef __cplusplus
} }