Skip to content

Commit

Permalink
wolfssl: bump version to 3.14.0
Browse files Browse the repository at this point in the history
Add upstream post-3.14.0 patch to fix build issue related to missing fips.h
header.

For more details, see:
wolfSSL/wolfssl#1415

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  • Loading branch information
jacmet authored and tpetazzoni committed Apr 4, 2018
1 parent 3b5c24a commit 0edfa02
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
@@ -0,0 +1,33 @@
From a7fe5e35025227e348eaef5a15fd55f591d77206 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Tue, 6 Mar 2018 13:15:35 -0800
Subject: [PATCH] Fix issue with the creation of dummy fips.h header.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
wolfssl/wolfcrypt/include.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wolfssl/wolfcrypt/include.am b/wolfssl/wolfcrypt/include.am
index c81bdd13..6e84ed9d 100644
--- a/wolfssl/wolfcrypt/include.am
+++ b/wolfssl/wolfcrypt/include.am
@@ -20,7 +20,6 @@ nobase_include_HEADERS+= \
wolfssl/wolfcrypt/fe_operations.h \
wolfssl/wolfcrypt/ge_operations.h \
wolfssl/wolfcrypt/error-crypt.h \
- wolfssl/wolfcrypt/fips.h \
wolfssl/wolfcrypt/fips_test.h \
wolfssl/wolfcrypt/hash.h \
wolfssl/wolfcrypt/hc128.h \
@@ -99,3 +98,7 @@ if BUILD_SELFTEST
nobase_include_HEADERS+= wolfssl/wolfcrypt/selftest.h
endif

+if BUILD_FIPS_V2
+nobase_include_HEADERS+= wolfssl/wolfcrypt/fips.h
+endif
+
--
2.11.0

2 changes: 1 addition & 1 deletion package/wolfssl/wolfssl.hash
@@ -1,5 +1,5 @@
# Locally computed:
sha256 3bafeb0cb7eaff80002ba3f7cbb70023757bcc35fc4d82181945b143f1f927c6 v3.13.0-stable.tar.gz
sha256 4ab543c869a65a77dc5d0bc934b9d4852aa3d5834bd2f707a74a936602bd3687 v3.14.0-stable.tar.gz

# Hash for license files:
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
Expand Down
2 changes: 1 addition & 1 deletion package/wolfssl/wolfssl.mk
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

WOLFSSL_VERSION = 3.13.0
WOLFSSL_VERSION = 3.14.0
WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/archive
WOLFSSL_SOURCE = v$(WOLFSSL_VERSION)-stable.tar.gz

Expand Down

0 comments on commit 0edfa02

Please sign in to comment.