bk commit into 5.0 tree (msvensson:1.2137)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2137 06/05/29 14:49:51 msvensson@shellback.(none) +6 -0
  Import from yaSSL 

  extra/yassl/taocrypt/src/misc.cpp
    1.13 06/05/29 13:42:21 msvensson@shellback.(none)[msvensson] +13 -0
    Import patch yassl.diff

  extra/yassl/taocrypt/src/integer.cpp
    1.23 06/05/22 20:04:53 msvensson@shellback.(none)[msvensson] +4 -1
    Import patch yassl.diff

  extra/yassl/src/yassl_int.cpp
    1.18 06/05/22 20:04:52 msvensson@shellback.(none)[msvensson] +8 -3
    Import patch yassl.diff

  extra/yassl/src/yassl_error.cpp
    1.6 06/05/22 20:12:03 msvensson@shellback.(none)[msvensson] +3 -0
    Import patch yassl.diff

  extra/yassl/mySTL/stdexcept.hpp
    1.5 06/03/29 01:56:39 msvensson@shellback.(none)[msvensson] +0 -2
    Import patch yassl.diff

  extra/yassl/include/yassl_error.hpp
    1.4 06/05/22 20:12:03 msvensson@shellback.(none)[msvensson] +2 -2
    Import patch yassl.diff

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/yassl_import/my50-yassl_import

--- 1.3/extra/yassl/include/yassl_error.hpp	2006-03-29 01:56:41 +02:00
+++ 1.4/extra/yassl/include/yassl_error.hpp	2006-05-22 20:12:03 +02:00
@@ -26,7 +26,6 @@
 #ifndef yaSSL_ERROR_HPP
 #define yaSSL_ERROR_HPP
 
-#include "stdexcept.hpp"
 
 
 namespace yaSSL {
@@ -63,7 +62,7 @@
 
 void SetErrorString(YasslError, char*);
 
-
+/* remove for now, if go back to exceptions use this wrapper
 // Base class for all yaSSL exceptions
 class Error : public mySTL::runtime_error {
     YasslError  error_;
@@ -75,6 +74,7 @@
     YasslError  get_number() const;
     Library     get_lib()    const;
 };
+*/
 
 
 } // naemspace

--- 1.4/extra/yassl/mySTL/stdexcept.hpp	2006-05-22 15:49:49 +02:00
+++ 1.5/extra/yassl/mySTL/stdexcept.hpp	2006-03-29 01:56:39 +02:00
@@ -46,10 +46,8 @@
     // for compiler generated call, never used
     static void operator delete(void*) { assert(0); }
 private:
-#if defined(__hpux)
     // don't allow dynamic creation of exceptions
     static void* operator new(size_t);
-#endif
 };
 
 

--- 1.5/extra/yassl/src/yassl_error.cpp	2006-05-15 01:40:59 +02:00
+++ 1.6/extra/yassl/src/yassl_error.cpp	2006-05-22 20:12:03 +02:00
@@ -27,10 +27,12 @@
 #include "yassl_error.hpp"
 #include "error.hpp"        // TaoCrypt error numbers
 #include "openssl/ssl.h"    // SSL_ERROR_WANT_READ
+#include <string.h>         // strncpy
 
 namespace yaSSL {
 
 
+/* may bring back in future
 Error::Error(const char* s, YasslError e, Library l) 
     : mySTL::runtime_error(s), error_(e), lib_(l) 
 {
@@ -48,6 +50,7 @@
 
     return lib_;
 }
+*/
 
 
 void SetErrorString(YasslError error, char* buffer)

--- 1.17/extra/yassl/src/yassl_int.cpp	2006-05-22 11:12:59 +02:00
+++ 1.18/extra/yassl/src/yassl_int.cpp	2006-05-22 20:04:52 +02:00
@@ -2106,9 +2106,14 @@
 extern "C" void yaSSL_CleanUp()
 {
     TaoCrypt::CleanUp();
-    ysDelete(yaSSL::cryptProviderInstance);
-    ysDelete(yaSSL::sslFactoryInstance);
-    ysDelete(yaSSL::sessionsInstance);
+    yaSSL::ysDelete(yaSSL::cryptProviderInstance);
+    yaSSL::ysDelete(yaSSL::sslFactoryInstance);
+    yaSSL::ysDelete(yaSSL::sessionsInstance);
+
+    // In case user calls more than once, prevent seg fault
+    yaSSL::cryptProviderInstance = 0;
+    yaSSL::sslFactoryInstance = 0;
+    yaSSL::sessionsInstance = 0;
 }
 
 

--- 1.22/extra/yassl/taocrypt/src/integer.cpp	2006-05-02 22:59:39 +02:00
+++ 1.23/extra/yassl/taocrypt/src/integer.cpp	2006-05-22 20:04:53 +02:00
@@ -2735,8 +2735,11 @@
 {
     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)

--- 1.12/extra/yassl/taocrypt/src/misc.cpp	2006-04-27 01:56:15 +02:00
+++ 1.13/extra/yassl/taocrypt/src/misc.cpp	2006-05-29 13:42:21 +02:00
@@ -81,6 +81,19 @@
 
     }
 
+#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