From a650e0d9f159dc43fc7330dfedbaf8a684c65a15 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Mon, 14 Aug 2017 06:37:10 -0400
Subject: [PATCH] Test iOS Watch and TV builds. Take 5

---
 .travis.yml   | 7 ++++---
 setenv-ios.sh | 7 ++++++-
 sha.cpp       | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f8bf37f..891d0dfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,9 +56,10 @@ matrix:
       env: BUILD_MODE="ios-tv"
 
   allow_failures:
-    # Ignore problems with old toolchains
-    - env: BUILD_MODE="ubsan"
-    - env: BUILD_MODE="asan"
+    - os: linux
+      env: BUILD_MODE="ios-watch"
+    - os: linux
+      env: BUILD_MODE="ios-tv"
 
 script:
   - |
diff --git a/setenv-ios.sh b/setenv-ios.sh
index dd714920..bc3cf219 100755
--- a/setenv-ios.sh
+++ b/setenv-ios.sh
@@ -204,10 +204,15 @@ if [ "$IOS_ARCH" == "armv7s" ]; then
 fi
 
 # 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
 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
 if [ "$IOS_ARCH" == "x86_64" ]; then
   IOS_FLAGS=-miphoneos-version-min=8
diff --git a/sha.cpp b/sha.cpp
index 494fa981..8f3fcb11 100644
--- a/sha.cpp
+++ b/sha.cpp
@@ -706,7 +706,7 @@ size_t SHA256::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);
 
 #if CRYPTOPP_SHANI_AVAILABLE