Import patch from yaSSL after fixing warnings upstream

extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff

2 files changed, 2 insertions, 3 deletions

diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp
index 419783403ea..85733b88aa9 100644
--- a/extra/yassl/taocrypt/src/integer.cpp
+++ b/extra/yassl/taocrypt/src/integer.cpp
@@ -3390,7 +3390,7 @@ void Integer::DivideByPowerOf2(Integer &r, Integer &q, const Integer &a,
         CopyWords(r.reg_.get_buffer(), a.reg_.get_buffer(), wordCount);
         SetWords(r.reg_+wordCount, 0, r.reg_.size()-wordCount);
         if (n % WORD_BITS != 0)
-            r.reg_[wordCount-1] %= (1 << (n % WORD_BITS));
+          r.reg_[wordCount-1] %= (word(1) << (n % WORD_BITS));
     }
     else
     {
diff --git a/extra/yassl/taocrypt/test/test.cpp b/extra/yassl/taocrypt/test/test.cpp
index 9cf9c52b2c7..0af278404ab 100644
--- a/extra/yassl/taocrypt/test/test.cpp
+++ b/extra/yassl/taocrypt/test/test.cpp
@@ -94,7 +94,6 @@ struct testVector {
                output_((byte*)out), inLen_(strlen(in)), outLen_(strlen(out)) {}
 };
 
-void file_test(int, char**);
 int  sha_test();
 int  sha256_test();
 #ifdef WORD64_AVAILABLE
@@ -300,7 +299,7 @@ void taocrypt_test(void* args)
 #endif // NO_MAIN_DRIVER
 
 
-void file_test(char* file, byte* check)
+void file_test(const char* file, byte* check)
 {
     FILE* f;
     int   i(0);