mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'IntelAsm' of https://github.com/kojo1/wolfssl into kojo-intel

Browse Source
This commit is contained in:
toddouska 2015-04-07 09:49:17 -07:00
commit b115e4d898
9 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IDE/iOS/README.md
View File

@ -28,13 +28,10 @@ order.
# Building libwolfssl.a
## Debug build
## Release build
A release build requires an Apple Developer account, as far as I can tell. I
have not tried this yet.
There are several options of builds. You can make a simulator build, or a
device build. Both are debug builds.
You can make an archive for a device, as well. That is a release build.
# Installing libwolfssl.a
@ -67,6 +64,9 @@ for "Preprocessor Macros" and add the following under both `Release` and
* `WOLFSSL_SHA512`
* `WOLFSSL_SHA384`
The approved FIPS source files are from the CyaSSL project v3.4.8.fips. The FIPS
and FIPS-TEST files are from our FIPS project v3.4.8. For the wolfCAVP test
the wolfSSL version used is v3.4.8.
# Using the FIPS library

4
IDE/iOS/wolfssl-FIPS.xcodeproj/project.pbxproj
View File

@ -295,7 +295,7 @@
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include/wolfssl;
dstSubfolderSpec = 16;
dstSubfolderSpec = 7;
files = (
521646C41A8A7FE10062516A /* callbacks.h in CopyFiles */,
521646C51A8A7FE10062516A /* certs_test.h in CopyFiles */,
@ -917,6 +917,7 @@
$SRCROOT,
$PROJECT_DIR/../..,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = wolfssl;
@ -947,6 +948,7 @@
$SRCROOT,
$PROJECT_DIR/../..,
);
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
PRODUCT_NAME = wolfssl;

2
IDE/iOS/wolfssl.xcodeproj/project.pbxproj
View File

@ -283,7 +283,7 @@
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = include/wolfssl;
dstSubfolderSpec = 16;
dstSubfolderSpec = 7;
files = (
521646C41A8A7FE10062516A /* callbacks.h in CopyFiles */,
521646C51A8A7FE10062516A /* certs_test.h in CopyFiles */,

15
README
View File

@ -37,7 +37,20 @@ before calling wolfSSL_new(); Though it's not recommended.
- GNU Binutils 2.24 ld has problems with some debug builds, to fix an ld error
add -fdebug-types-section to C_EXTRA_FLAGS
wolfSSL (Formerly CyaSSL) Release 3.4.6 (03/30/2015)
wolfSSL (Formerly CyaSSL) Release 3.4.8 (04/06/2015)
Release 3.4.8 of wolfSSL has bug fixes and new features including:
- FIPS version submitted for iOS.
- Max Strength build that only allows TLSv1.2, AEAD ciphers, and PFS.
- Improvements to usage of time code.
- Improvements to VS solution files.
See INSTALL file for build instructions.
More info can be found on-line at //http://wolfssl.com/yaSSL/Docs.html
*****************wolfSSL (Formerly CyaSSL) Release 3.4.6 (03/30/2015)
Release 3.4.6 of wolfSSL has bug fixes and new features including:

13
README.md
View File

@ -38,6 +38,19 @@ before calling wolfSSL_new(); Though it's not recommended.
- GNU Binutils 2.24 ld has problems with some debug builds, to fix an ld error
add -fdebug-types-section to C_EXTRA_FLAGS
#wolfSSL (Formerly CyaSSL) Release 3.4.8 (04/06/2015)
##Release 3.4.8 of wolfSSL has bug fixes and new features including:
- FIPS version submitted for iOS.
- Max Strength build that only allows TLSv1.2, AEAD ciphers, and PFS.
- Improvements to usage of time code.
- Improvements to VS solution files.
See INSTALL file for build instructions.
More info can be found on-line at //http://wolfssl.com/yaSSL/Docs.html
#wolfSSL (Formerly CyaSSL) Release 3.4.6 (03/30/2015)
##Release 3.4.6 of wolfSSL has bug fixes and new features including:

2
configure.ac
View File

@ -6,7 +6,7 @@
#
#
AC_INIT([wolfssl],[3.4.7],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_INIT([wolfssl],[3.4.8],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
AC_CONFIG_AUX_DIR([build-aux])

2
support/wolfssl.pc
View File

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

6
wolfcrypt/src/asm.c
View File

@ -65,9 +65,11 @@
#define CPUID_AVX2 0x2
#define CPUID_RDRAND 0x4
#define CPUID_RDSEED 0x8
#define CPUID_BMI2 0x10
#define IS_INTEL_AVX1 (cpuid_flags&CPUID_AVX1)
#define IS_INTEL_AVX2 (cpuid_flags&CPUID_AVX2)
#define IS_INTEL_BMI2 (cpuid_flags&CPUID_BMI2)
#define IS_INTEL_RDRAND (cpuid_flags&CPUID_RDRAND)
#define IS_INTEL_RDSEED (cpuid_flags&CPUID_RDSEED)
#define SET_FLAGS
@ -95,7 +97,7 @@ static word32 cpuid_flag(word32 leaf, word32 sub, word32 num, word32 bit) {
INLINE static int set_cpuid_flags(void) {
if(cpuid_check == 0) {
if(cpuid_flag(7, 0, EBX, 5)){ cpuid_flags |= CPUID_AVX2 ; }
if(cpuid_flag(7, 0, EBX, 8)){ cpuid_flags |= CPUID_BMI2 ; }
cpuid_check = 1 ;
return 0 ;
}
@ -105,7 +107,7 @@ INLINE static int set_cpuid_flags(void) {
#define RETURN return
#define IF_HAVE_INTEL_MULX(func, ret) \
if(cpuid_check==0)set_cpuid_flags() ; \
if(IS_INTEL_AVX2){ func; ret ; }
if(IS_INTEL_BMI2){ func; ret ; }
#else
#define IF_HAVE_INTEL_MULX(func, ret)

4
wolfssl/version.h
View File

@ -26,8 +26,8 @@
extern "C" {
#endif
#define LIBWOLFSSL_VERSION_STRING "3.4.7"
#define LIBWOLFSSL_VERSION_HEX 0x03004007
#define LIBWOLFSSL_VERSION_STRING "3.4.8"
#define LIBWOLFSSL_VERSION_HEX 0x03004008
#ifdef __cplusplus
}