summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-04-21 18:19:50 +0200
committerunknown <msvensson@neptunus.(none)>2006-04-21 18:19:50 +0200
commit8b123043371b0c0c642912a5b3548448d4e026ed (patch)
tree47ff318a4fef00542a0ae6ffdae82a53180c9bb8 /extra
parent3b76cfc210fd64e018b0cd5d40aa2e69f28e925e (diff)
downloadmariadb-git-8b123043371b0c0c642912a5b3548448d4e026ed.tar.gz
Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/src/template_instnt.cpp7
-rw-r--r--extra/yassl/taocrypt/src/template_instnt.cpp3
2 files changed, 3 insertions, 7 deletions
diff --git a/extra/yassl/src/template_instnt.cpp b/extra/yassl/src/template_instnt.cpp
index c55ca39bec2..5782df213ea 100644
--- a/extra/yassl/src/template_instnt.cpp
+++ b/extra/yassl/src/template_instnt.cpp
@@ -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*>;
diff --git a/extra/yassl/taocrypt/src/template_instnt.cpp b/extra/yassl/taocrypt/src/template_instnt.cpp
index eabcc6d9779..12bcd8238f2 100644
--- a/extra/yassl/taocrypt/src/template_instnt.cpp
+++ b/extra/yassl/taocrypt/src/template_instnt.cpp
@@ -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 void tcArrayDelete<char>(char*);
template class PBKDF2_HMAC<SHA>;
template class HMAC<MD5>;
template class HMAC<SHA>;
+template class HMAC<RIPEMD160>;
+
}
namespace mySTL {