bk commit into 5.0 tree (msvensson:1.2172)

[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.2172 06/04/21 18:19:50 msvensson@neptunus.(none) +2 -0
  Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  extra/yassl/taocrypt/src/template_instnt.cpp
    1.9 06/04/21 18:19:46 msvensson@neptunus.(none) +3 -0
    Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

  extra/yassl/src/template_instnt.cpp
    1.6 06/04/21 18:19:46 msvensson@neptunus.(none) +0 -7
    Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.5/extra/yassl/src/template_instnt.cpp	2006-04-18 22:17:38 +02:00
+++ 1.6/extra/yassl/src/template_instnt.cpp	2006-04-21 18:19:46 +02:00
@@ -35,13 +35,6 @@
 #include "openssl/ssl.h"
 
 #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
-#if !defined(USE_CRYPTOPP_LIB)
-namespace TaoCrypt {
-template class HMAC<MD5>;
-template class HMAC<SHA>;
-template class HMAC<RIPEMD160>;
-}
-#endif  // USE_CRYPTOPP_LIB
 
 namespace mySTL {
 template class list<unsigned char*>;

--- 1.8/extra/yassl/taocrypt/src/template_instnt.cpp	2006-04-18 22:17:39 +02:00
+++ 1.9/extra/yassl/taocrypt/src/template_instnt.cpp	2006-04-21 18:19:46 +02:00
@@ -30,6 +30,7 @@
 #include "sha.hpp"
 #include "md5.hpp"
 #include "hmac.hpp"
+#include "ripemd.hpp"
 #include "pwdbased.hpp"
 #include "algebra.hpp"
 #include "vector.hpp"
@@ -62,6 +63,8 @@
 template class PBKDF2_HMAC<SHA>;
 template class HMAC<MD5>;
 template class HMAC<SHA>;
+template class HMAC<RIPEMD160>;
+
 }
 
 namespace mySTL {