9 files changed, 43 insertions, 14 deletions
diff --git a/extra/yassl/taocrypt/include/asn.hpp b/extra/yassl/taocrypt/include/asn.hpp
index 8bea2ae780b..dbee54be6f1 100644
--- a/extra/yassl/taocrypt/include/asn.hpp
+++ b/extra/yassl/taocrypt/include/asn.hpp
@@ -33,10 +33,12 @@
 
 #include "misc.hpp"
 #include "block.hpp"
-#include "list.hpp"
 #include "error.hpp"
+#include STL_LIST_FILE
 
 
+namespace STL = STL_NAMESPACE;
+
 
 namespace TaoCrypt {
 
@@ -232,7 +234,7 @@ private:
 };
 
 
-typedef mySTL::list<Signer*> SignerList;
+typedef STL::list<Signer*> SignerList;
 
 
 enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA =649};
diff --git a/extra/yassl/taocrypt/include/block.hpp b/extra/yassl/taocrypt/include/block.hpp
index 88cb06f62f1..a931158a83d 100644
--- a/extra/yassl/taocrypt/include/block.hpp
+++ b/extra/yassl/taocrypt/include/block.hpp
@@ -31,12 +31,14 @@
 #ifndef TAO_CRYPT_BLOCK_HPP
 #define TAO_CRYPT_BLOCK_HPP
 
-#include "algorithm.hpp"    // mySTL::swap
 #include "misc.hpp"
 #include <string.h>         // memcpy
 #include <stddef.h>         // ptrdiff_t
+#include STL_ALGORITHM_FILE
 
 
+namespace STL = STL_NAMESPACE;
+
 
 namespace TaoCrypt {
 
@@ -80,7 +82,7 @@ typename A::pointer StdReallocate(A& a, T* p, typename A::size_type oldSize,
         typename A::pointer newPointer = b.allocate(newSize, 0);
         memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize));
         a.deallocate(p, oldSize);
-        mySTL::swap(a, b);
+        STL::swap(a, b);
         return newPointer;
     }
     else {
@@ -183,9 +185,9 @@ public:
     }
 
     void Swap(Block& other) {
-        mySTL::swap(sz_, other.sz_);
-        mySTL::swap(buffer_, other.buffer_);
-        mySTL::swap(allocator_, other.allocator_);
+        STL::swap(sz_, other.sz_);
+        STL::swap(buffer_, other.buffer_);
+        STL::swap(allocator_, other.allocator_);
     }
 
     ~Block() { allocator_.deallocate(buffer_, sz_); }
diff --git a/extra/yassl/taocrypt/include/blowfish.hpp b/extra/yassl/taocrypt/include/blowfish.hpp
index fbc4f223702..40953624232 100644
--- a/extra/yassl/taocrypt/include/blowfish.hpp
+++ b/extra/yassl/taocrypt/include/blowfish.hpp
@@ -32,7 +32,11 @@
 
 #include "misc.hpp"
 #include "modes.hpp"
-#include "algorithm.hpp"
+#include STL_ALGORITHM_FILE
+
+
+namespace STL = STL_NAMESPACE;
+
 
 namespace TaoCrypt {
 
diff --git a/extra/yassl/taocrypt/include/error.hpp b/extra/yassl/taocrypt/include/error.hpp
index b0ff9b280ba..1a93056db45 100644
--- a/extra/yassl/taocrypt/include/error.hpp
+++ b/extra/yassl/taocrypt/include/error.hpp
@@ -37,7 +37,7 @@ namespace TaoCrypt {
 
 enum ErrorNumber {
 
-NO_ERROR   =    0, // "not in error state"
+NO_ERROR_E   =    0, // "not in error state"
 
 // RandomNumberGenerator
 WINCRYPT_E      = 1001, // "bad wincrypt acquire"
@@ -78,7 +78,7 @@ SIG_OTHER_E     = 1039  // "bad other signature confirmation"
 struct Error {
     ErrorNumber  what_;    // description number, 0 for no error
 
-    explicit Error(ErrorNumber w = NO_ERROR) : what_(w) {}
+    explicit Error(ErrorNumber w = NO_ERROR_E) : what_(w) {}
 
     ErrorNumber What()            const  { return what_; }
     void        SetError(ErrorNumber w)  { what_ = w; }
diff --git a/extra/yassl/taocrypt/include/file.hpp b/extra/yassl/taocrypt/include/file.hpp
index 87fc6139f8f..c12b5c73bac 100644
--- a/extra/yassl/taocrypt/include/file.hpp
+++ b/extra/yassl/taocrypt/include/file.hpp
@@ -83,7 +83,7 @@ private:
     void Swap(Source& other) 
     {
         buffer_.Swap(other.buffer_);
-        mySTL::swap(current_, other.current_);
+        STL::swap(current_, other.current_);
     }
 
 };
diff --git a/extra/yassl/taocrypt/include/integer.hpp b/extra/yassl/taocrypt/include/integer.hpp
index 7e4f6450316..70b4dc79e73 100644
--- a/extra/yassl/taocrypt/include/integer.hpp
+++ b/extra/yassl/taocrypt/include/integer.hpp
@@ -44,8 +44,8 @@
 #include "block.hpp"
 #include "random.hpp"
 #include "file.hpp"
-#include "algorithm.hpp"    // mySTL::swap
 #include <string.h>
+#include STL_ALGORITHM_FILE
 
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
diff --git a/extra/yassl/taocrypt/include/misc.hpp b/extra/yassl/taocrypt/include/misc.hpp
index 48604620706..3d2d4c62466 100644
--- a/extra/yassl/taocrypt/include/misc.hpp
+++ b/extra/yassl/taocrypt/include/misc.hpp
@@ -198,6 +198,23 @@ void CleanUp();
 #endif
 
 
+#ifdef USE_SYS_STL
+    // use system STL
+    #define STL_VECTOR_FILE    <vector>
+    #define STL_LIST_FILE      <list>
+    #define STL_ALGORITHM_FILE <algorithm>
+    #define STL_MEMORY_FILE    <memory>
+    #define STL_NAMESPACE       std
+#else
+    // use mySTL
+    #define STL_VECTOR_FILE    "vector.hpp"
+    #define STL_LIST_FILE      "list.hpp"
+    #define STL_ALGORITHM_FILE "algorithm.hpp"
+    #define STL_MEMORY_FILE    "memory.hpp"
+    #define STL_NAMESPACE       mySTL
+#endif
+
+
 // ***************** DLL related ********************
 
 #ifdef TAOCRYPT_WIN32_AVAILABLE
diff --git a/extra/yassl/taocrypt/include/pwdbased.hpp b/extra/yassl/taocrypt/include/pwdbased.hpp
index c3e916e3d83..78df7ede02e 100644
--- a/extra/yassl/taocrypt/include/pwdbased.hpp
+++ b/extra/yassl/taocrypt/include/pwdbased.hpp
@@ -74,7 +74,7 @@ word32 PBKDF2_HMAC<T>::DeriveKey(byte* derived, word32 dLen, const byte* pwd,
 		}
 		hmac.Final(buffer.get_buffer());
 
-		word32 segmentLen = mySTL::min(dLen, buffer.size());
+		word32 segmentLen = min(dLen, buffer.size());
 		memcpy(derived, buffer.get_buffer(), segmentLen);
 
 		for (j = 1; j < iterations; j++) {
diff --git a/extra/yassl/taocrypt/include/twofish.hpp b/extra/yassl/taocrypt/include/twofish.hpp
index 0529c37d6c5..ba144d2defb 100644
--- a/extra/yassl/taocrypt/include/twofish.hpp
+++ b/extra/yassl/taocrypt/include/twofish.hpp
@@ -32,7 +32,11 @@
 
 #include "misc.hpp"
 #include "modes.hpp"
-#include "algorithm.hpp"
+#include STL_ALGORITHM_FILE
+
+
+namespace STL = STL_NAMESPACE;
+
 
 namespace TaoCrypt {