Fix FTBFS when PKCS option disabled

pull/1/head
Timothy Pearson 10 years ago
parent 897752b61a
commit 48efde854f

@ -16,7 +16,9 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
#define _TDECRYPTOGRAPHICCARDDEVICE_INTERNAL 1 #ifdef WITH_PKCS
#define _TDECRYPTOGRAPHICCARDDEVICE_INTERNAL 1
#endif
#include "tdecryptographiccarddevice_private.h" #include "tdecryptographiccarddevice_private.h"
#include "tdecryptographiccarddevice.h" #include "tdecryptographiccarddevice.h"
@ -227,10 +229,12 @@ TQString CryptoCardDeviceWatcher::getCardATR(TQString readerName) {
#endif #endif
} }
#ifdef WITH_PKCS
static void pkcs_log_hook(IN void * const global_data, IN unsigned flags, IN const char * const format, IN va_list args) { static void pkcs_log_hook(IN void * const global_data, IN unsigned flags, IN const char * const format, IN va_list args) {
vprintf(format, args); vprintf(format, args);
printf("\n"); printf("\n");
} }
#endif
int CryptoCardDeviceWatcher::retrieveCardCertificates(TQString readerName) { int CryptoCardDeviceWatcher::retrieveCardCertificates(TQString readerName) {
#if WITH_PKCS #if WITH_PKCS
@ -345,6 +349,7 @@ int CryptoCardDeviceWatcher::retrieveCardCertificates(TQString readerName) {
} }
void CryptoCardDeviceWatcher::deleteAllCertificatesFromCache() { void CryptoCardDeviceWatcher::deleteAllCertificatesFromCache() {
#ifdef WITH_PKCS
X509 *x509_cert; X509 *x509_cert;
X509CertificatePtrListIterator it; X509CertificatePtrListIterator it;
@ -354,6 +359,7 @@ void CryptoCardDeviceWatcher::deleteAllCertificatesFromCache() {
} }
cardDevice->m_cardCertificates.clear(); cardDevice->m_cardCertificates.clear();
#endif
} }
TDECryptographicCardDevice::TDECryptographicCardDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), TDECryptographicCardDevice::TDECryptographicCardDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn),

@ -1,4 +1,3 @@
/* This file is part of the TDE libraries /* This file is part of the TDE libraries
Copyright (C) 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net> Copyright (C) 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>

Loading…
Cancel
Save