From 3887c919c3a71c7951ab01bbf0d379ee555e4645 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 16 Aug 2017 22:56:36 -0400
Subject: [PATCH 1/2] Clear unused variable warnings under MSVC

---
 dh2.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dh2.cpp b/dh2.cpp
index 26b714d4..4c062d4e 100644
--- a/dh2.cpp
+++ b/dh2.cpp
@@ -11,11 +11,14 @@ NAMESPACE_BEGIN(CryptoPP)
 struct NullCryptoParameters : public CryptoParameters
 {
 	void AssignFrom(const NameValuePairs &source) {
+		CRYPTOPP_UNUSED(source);
 	}
 	bool Validate(RandomNumberGenerator &rng, unsigned int level) const {
+		CRYPTOPP_UNUSED(rng); CRYPTOPP_UNUSED(level);
 		return false;
 	}
 	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const {
+		CRYPTOPP_UNUSED(name); CRYPTOPP_UNUSED(valueType); CRYPTOPP_UNUSED(pValue);
 		return false;
 	}
 };
@@ -35,10 +38,14 @@ struct NullSimpleKeyAgreementDomain : public TwoBases<NullCryptoParameters, Simp
 		return 1;
 	}
 	void GeneratePrivateKey(RandomNumberGenerator &rng, byte *privateKey) const {
+		CRYPTOPP_UNUSED(rng); CRYPTOPP_UNUSED(privateKey);
 	}
 	void GeneratePublicKey(RandomNumberGenerator &rng, const byte *privateKey, byte *publicKey) const {
+		CRYPTOPP_UNUSED(rng); CRYPTOPP_UNUSED(privateKey); CRYPTOPP_UNUSED(publicKey);
 	}
 	bool Agree(byte *agreedValue, const byte *privateKey, const byte *otherPublicKey, bool validateOtherPublicKey=true) const {
+		CRYPTOPP_UNUSED(agreedValue); CRYPTOPP_UNUSED(privateKey);
+		CRYPTOPP_UNUSED(otherPublicKey); CRYPTOPP_UNUSED(validateOtherPublicKey);
 		return false;
 	}
 };

From f099d2df910d7f1a67e508903e72f3ec7abab480 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 16 Aug 2017 23:15:23 -0400
Subject: [PATCH 2/2] Remove ios-tv from allow_failures

---
 .travis.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c96ed5a5..bbb54fed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ env:
     - BUILD_MODE="ubsan"
     - BUILD_MODE="ios-arm"
     - BUILD_MODE="ios-arm64"
+    - BUILD_MODE="ios-watch"
+    - BUILD_MODE="ios-tv"
 
 matrix:
 
@@ -48,11 +50,14 @@ matrix:
       env: BUILD_MODE="ios-arm"
     - os: linux
       env: BUILD_MODE="ios-arm64"
+    - os: linux
+      env: BUILD_MODE="ios-watch"
+    - os: linux
+      env: BUILD_MODE="ios-tv"
 
   allow_failures:
-    # Ignore problems with old toolchains
-    - env: BUILD_MODE="ubsan"
-    - env: BUILD_MODE="asan"
+    - os: osx
+      env: BUILD_MODE="ios-watch"
 
 script:
   - |
@@ -64,6 +69,14 @@ script:
         cp ./TestScripts/setenv-ios.sh .
         . ./setenv-ios.sh arm64
         make -f GNUmakefile-cross
+    elif [[ "$BUILD_MODE" == "ios-watch" ]]; then
+        cp ./TestScripts/setenv-ios.sh .
+        . ./setenv-ios.sh watch
+        make -f GNUmakefile-cross
+    elif [[ "$BUILD_MODE" == "ios-tv" ]]; then
+        cp ./TestScripts/setenv-ios.sh .
+        . ./setenv-ios.sh tv
+        make -f GNUmakefile-cross
     else
         make "$BUILD_MODE"
         ./cryptest.exe v