Import from yaSSL

extra/yassl/include/yassl_error.hpp:
  Import patch yassl.diff
extra/yassl/mySTL/stdexcept.hpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_int.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/misc.cpp:
  Import patch yassl.diff

2 files changed, 17 insertions, 1 deletions

diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp
index 885ddfbf630..a296e122985 100644
--- a/extra/yassl/taocrypt/src/integer.cpp
+++ b/extra/yassl/taocrypt/src/integer.cpp
@@ -2735,8 +2735,11 @@ void CleanUp()
 {
     tcDelete(one);
     tcDelete(zero);
-}
 
+    // In case user calls more than once, prevent seg fault
+    one  = 0;
+    zero = 0;
+}
 
 Integer::Integer(RandomNumberGenerator& rng, const Integer& min,
                  const Integer& max)
diff --git a/extra/yassl/taocrypt/src/misc.cpp b/extra/yassl/taocrypt/src/misc.cpp
index 4ef163a7f5d..2869df71c8a 100644
--- a/extra/yassl/taocrypt/src/misc.cpp
+++ b/extra/yassl/taocrypt/src/misc.cpp
@@ -81,6 +81,19 @@ extern "C" {
 
     }
 
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+
+extern "C" {
+
+    int __cxa_pure_virtual() {
+      assert("Pure virtual method called." == "Aborted");
+      return 0;
+    }
+
+}  // extern "C"
+
+#endif
+
 #endif // YASSL_PURE_C