From 6b200c80cfc1c4da49e5ab06b73cc3f730526103 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 2 Aug 2017 04:02:32 -0400
Subject: [PATCH 1/4] Fix x64 builds Take 3

---
 .appveyor.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.appveyor.yml b/.appveyor.yml
index 40fd29e7..80006a6b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -35,6 +35,14 @@ test_script:
 
 - cmd: >-
 
+    vcupgrade.exe -nologo -overwrite cryptlib.vcxproj
+    
+    vcupgrade.exe -nologo -overwrite cryptest.vcxproj
+
+    msbuild /t:Build cryptlib.vcxproj
+
+    msbuild /t:Build cryptest.vcxproj
+
     msbuild /t:CopyCryptestToRoot cryptest.vcxproj
 
     cryptest.exe v

From 820d62f97834dd9c3ce9d1f217c202395e123ff7 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 2 Aug 2017 04:32:18 -0400
Subject: [PATCH 2/4] Partially fix AppVeyor build AppVeyor still has problems,
 like not being able to run a x64 test

---
 .appveyor.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 80006a6b..0ba54d7b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -25,20 +25,16 @@ image:
 - Visual Studio 2015
 - Visual Studio 2013
 
-build:
+build: off
 
-  project: cryptest.sln
-  verbosity: minimal
-  parallel: true
+#  project: cryptest.sln
+#  verbosity: minimal
+#  parallel: true
 
 test_script:
 
 - cmd: >-
 
-    vcupgrade.exe -nologo -overwrite cryptlib.vcxproj
-    
-    vcupgrade.exe -nologo -overwrite cryptest.vcxproj
-
     msbuild /t:Build cryptlib.vcxproj
 
     msbuild /t:Build cryptest.vcxproj

From 49515c3a73faa2069e1e7c175278849813516412 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 2 Aug 2017 04:59:42 -0400
Subject: [PATCH 3/4] Whitespace check-in

---
 validat0.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/validat0.cpp b/validat0.cpp
index 8c2f7692..3a24c6b3 100644
--- a/validat0.cpp
+++ b/validat0.cpp
@@ -198,14 +198,14 @@ bool TestCompressors()
     {
         std::string filename = "test.txt";
         std::string comment = "This is a test";
-        word32 filetime = GlobalRNG().GenerateWord32(8, 0xffffff);
+        word32 filetime = GlobalRNG().GenerateWord32(4, 0xffffff);
 
         AlgorithmParameters params = MakeParameters(Name::FileTime(), (int)filetime)
             (Name::FileName(), ConstByteArrayParameter(filename.c_str(), false))
             (Name::Comment(), ConstByteArrayParameter(comment.c_str(), false));
 
         std::string src, dest;
-        unsigned int len = GlobalRNG().GenerateWord32(8, 0xfff);
+        unsigned int len = GlobalRNG().GenerateWord32(4, 0xfff);
 
         src.resize(len);
         GlobalRNG().GenerateBlock(reinterpret_cast<byte*>(&src[0]), src.size());
@@ -233,7 +233,7 @@ bool TestCompressors()
     for (unsigned int i = 0; i<128; i++)
     {
         std::string src, dest;
-        unsigned int len = GlobalRNG().GenerateWord32(8, 0xfff);
+        unsigned int len = GlobalRNG().GenerateWord32(4, 0xfff);
 
         src.resize(len);
         GlobalRNG().GenerateBlock(reinterpret_cast<byte*>(&src[0]), src.size());
@@ -248,7 +248,7 @@ bool TestCompressors()
     for (unsigned int i = 0; i<128; i++)
     {
         std::string src, dest;
-        unsigned int len = GlobalRNG().GenerateWord32(8, 0xfff);
+        unsigned int len = GlobalRNG().GenerateWord32(4, 0xfff);
 
         src.resize(len);
         GlobalRNG().GenerateBlock(reinterpret_cast<byte*>(&src[0]), src.size());
@@ -345,7 +345,7 @@ bool TestCompressors()
     for (unsigned int i = 0; i<128; i++)
     {
         std::string src, dest;
-        unsigned int len = GlobalRNG().GenerateWord32(8, 0xfff);
+        unsigned int len = GlobalRNG().GenerateWord32(4, 0xfff);
 
         src.resize(len);
         GlobalRNG().GenerateBlock(reinterpret_cast<byte*>(&src[0]), src.size());
@@ -443,7 +443,7 @@ bool TestEncryptors()
         for (unsigned int i=0; i<ENCRYPT_COUNT; ++i)
         {
             std::string pwd, src, dest, rec;
-            unsigned int len = GlobalRNG().GenerateWord32(16, 0xfff);
+            unsigned int len = GlobalRNG().GenerateWord32(8, 0xfff);
 
             src.resize(len);
             GlobalRNG().GenerateBlock(reinterpret_cast<byte*>(&src[0]), src.size());
@@ -475,7 +475,7 @@ bool TestEncryptors()
     {
         for (unsigned int i=0; i<ENCRYPT_MAC_COUNT; ++i)
         {
-			const unsigned int runt = DefaultEncryptorWithMAC::SALTLENGTH+DefaultEncryptorWithMAC::KEYLENGTH;
+            const unsigned int runt = DefaultEncryptorWithMAC::SALTLENGTH + DefaultEncryptorWithMAC::KEYLENGTH;
             std::string pwd, src, dest, rec;
             unsigned int len = GlobalRNG().GenerateWord32(runt, 0xfff);
 
@@ -574,7 +574,7 @@ bool TestEncryptors()
     {
         for (unsigned int i=0; i<ENCRYPT_MAC_COUNT; ++i)
         {
-			const unsigned int runt = LegacyEncryptorWithMAC::SALTLENGTH+LegacyEncryptorWithMAC::KEYLENGTH;
+            const unsigned int runt = LegacyDecryptorWithMAC::SALTLENGTH + LegacyDecryptorWithMAC::KEYLENGTH;
             std::string pwd, src, dest, rec;
             unsigned int len = GlobalRNG().GenerateWord32(runt, 0xfff);
 
@@ -651,7 +651,7 @@ bool TestSharing()
     for (unsigned int shares=3; shares<INFORMATION_SHARES; ++shares)
     {
         std::string message;
-        unsigned int len = GlobalRNG().GenerateWord32(8, 0xff);
+        unsigned int len = GlobalRNG().GenerateWord32(4, 0xff);
         unsigned int threshold = GlobalRNG().GenerateWord32(2, shares-1);
 
         message.resize(len);
@@ -722,7 +722,7 @@ bool TestSharing()
     {
 
         std::string message;
-        unsigned int len = GlobalRNG().GenerateWord32(8, 0xff);
+        unsigned int len = GlobalRNG().GenerateWord32(4, 0xff);
         unsigned int threshold = GlobalRNG().GenerateWord32(2, shares-1);
 
         message.resize(len);
@@ -2491,9 +2491,9 @@ bool TestHuffmanCodes()
             byte data1[0xfff];  // Place on stack, avoid new
             unsigned int data2[0xff];
 
-            unsigned int len1 = GlobalRNG().GenerateWord32(8, 0xfff);
+            unsigned int len1 = GlobalRNG().GenerateWord32(4, 0xfff);
             GlobalRNG().GenerateBlock(data1, len1);
-            unsigned int len2 = GlobalRNG().GenerateWord32(8, 0xff);
+            unsigned int len2 = GlobalRNG().GenerateWord32(4, 0xff);
             GlobalRNG().GenerateBlock((byte*)data2, len2*sizeof(unsigned int));
 
             ArraySource source(data1, len1, false);

From 2578bccf083bcc6fb8cff98d8f51103328d4a02e Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 2 Aug 2017 05:42:24 -0400
Subject: [PATCH 4/4] Reconfigure AppVeyor email notifications Hopefully they
 will get through, soon

---
 .appveyor.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 0ba54d7b..4c64133f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -49,8 +49,8 @@ test_script:
 #  - https://stackoverflow.com/questions/43441273/how-to-run-vcupgrade-before-appveyor-build
 #  - https://stackoverflow.com/questions/43423761/cant-perform-64-bit-testing-under-appveyor
 # Appveyor also complains that it can't find VS2010 tools even though the docs state they are there.
+
 matrix:
-#  allow_failures:
 
   exclude:
 #    - platform: x64
@@ -61,8 +61,9 @@ matrix:
     - image: Visual Studio 2017
 
 notifications:
-  email:
-    recipients:
-      - cryptopp-build@googlegroups.com
-    on_success: always # default: change
-    on_failure: always # default: always
+    - provider: Email
+      to:
+        - cryptopp-build@googlegroups.com
+      on_build_success: true
+      on_build_failure: true
+