Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-11 06:35:38 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add compatibility with libgcrypt 1.6.

Browse source 
Closes #129
This commit is contained in:
Felix Geyer 2014-01-12 12:39:39 +01:00
parent 8e86437e89
commit 8c7e655274
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/crypto/Crypto.cpp
View file

@ -23,6 +23,7 @@
bool Crypto::m_initalized(false); bool Crypto::m_initalized(false);
#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
static int gcry_qt_mutex_init(void** p_sys) static int gcry_qt_mutex_init(void** p_sys)
{ {
*p_sys = new QMutex(); *p_sys = new QMutex();
@ -57,6 +58,7 @@ static const struct gcry_thread_cbs gcry_threads_qt =
gcry_qt_mutex_unlock, gcry_qt_mutex_unlock,
0, 0, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 0, 0, 0, 0
}; };
#endif
Crypto::Crypto() Crypto::Crypto()
{ {
@ -69,7 +71,10 @@ void Crypto::init()
return; return;
} }
// libgcrypt >= 1.6 doesn't allow custom thread callbacks anymore.
#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt); gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt);
#endif
gcry_check_version(0); gcry_check_version(0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);