QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-27 12:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Make it build with current versions of Botan

Browse Source 
(tested 1.8.8)

svn path=/trunk/kdesupport/qca/; revision=1058526
This commit is contained in:
Bernhard Rosenkraenzer 2009-12-04 16:02:11 +00:00
parent 9576352278
commit 311784a999
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/qca-botan/qca-botan.cpp
View File

@ -25,6 +25,9 @@
#include <botan/botan.h>
#include <botan/hmac.h>
#include <botan/s2k.h>
#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,8,0)
#include <botan/algo_factory.h>
#endif
#include <stdlib.h>
#include <iostream>
@ -47,8 +50,11 @@ public:
QCA::SecureArray buf(size);
#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,5,0)
Botan::Global_RNG::randomize( (Botan::byte*)buf.data(), buf.size(), Botan::SessionKey );
#else
#elif BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,7,6)
Botan::Global_RNG::randomize( (Botan::byte*)buf.data(), buf.size() );
#else
Botan::AutoSeeded_RNG rng;
rng.randomize(reinterpret_cast<Botan::byte*>(buf.data()), buf.size());
#endif
return buf;
}
@ -102,7 +108,11 @@ class BotanHMACContext : public QCA::MACContext
public:
BotanHMACContext( const QString &hashName, QCA::Provider *p, const QString &type) : QCA::MACContext(p, type)
{
#if BOTAN_VERSION_CODE < BOTAN_VERSION_CODE_FOR(1,8,0)
m_hashObj = new Botan::HMAC(hashName.toStdString());
#else
m_hashObj = new Botan::HMAC(Botan::global_state().algorithm_factory().make_hash_function(hashName.toStdString()));
#endif
if (0 == m_hashObj) {
std::cout << "null context object" << std::endl;
}