arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Test iOS Watch and TV builds. 

Take 5
pull/461/head
Jeffrey Walton 2017-08-14 06:37:10 -04:00
parent 74aa5b7e12
commit a650e0d9f1
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -56,9 +56,10 @@ matrix:
env: BUILD_MODE="ios-tv" env: BUILD_MODE="ios-tv"
allow_failures: allow_failures:
# Ignore problems with old toolchains - os: linux
- env: BUILD_MODE="ubsan" env: BUILD_MODE="ios-watch"
- env: BUILD_MODE="asan" - os: linux
env: BUILD_MODE="ios-tv"
script: script:
- | - |

7
setenv-ios.sh
View File

@ -204,10 +204,15 @@ if [ "$IOS_ARCH" == "armv7s" ]; then
fi fi
# ARM64 fixup. Xcode 5/iOS 7 # ARM64 fixup. Xcode 5/iOS 7
if [ "$IOS_ARCH" == "arm64" ] && [ "$APPLE_SDK" != "AppleTVOS" ]; then if [ "$IOS_ARCH" == "arm64" ]; then
IOS_FLAGS=-miphoneos-version-min=7 IOS_FLAGS=-miphoneos-version-min=7
fi fi
# Yet another ARM64 fixup.
if [ "$APPLE_SDK" == "AppleTVOS" ]; then
IOS_FLAGS=
fi
# ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386 # ARM64 Simulator fixup. Under Xcode 6/iOS 8, it uses x86_64 and not i386
if [ "$IOS_ARCH" == "x86_64" ]; then if [ "$IOS_ARCH" == "x86_64" ]; then
IOS_FLAGS=-miphoneos-version-min=8 IOS_FLAGS=-miphoneos-version-min=8

2
sha.cpp
View File

@ -706,7 +706,7 @@ size_t SHA256::HashMultipleBlocks(const word32 *input, size_t length)
size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length) size_t SHA224::HashMultipleBlocks(const word32 *input, size_t length)
{ {
CRYPTOPP_ASSERT(input); CRYPTOPP_ASSERT(input);
CRYPTOPP_ASSERT(length >= SHA256::BLOCKSIZE); CRYPTOPP_ASSERT(length >= SHA256::BLOCKSIZE);
#if CRYPTOPP_SHANI_AVAILABLE #if CRYPTOPP_SHANI_AVAILABLE