summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-09-08 01:54:16 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-09-08 01:54:16 -0500
commit48efde854f382d44ce38c2a8d72233d3ff216428 (patch)
treeb1db21a7c2af4dca3f019bb0696aad88c761cd04
parent897752b61a622dca67b10519e989d986f460ce14 (diff)
downloadtdelibs-48efde854f382d44ce38c2a8d72233d3ff216428.tar.gz
tdelibs-48efde854f382d44ce38c2a8d72233d3ff216428.zip
Fix FTBFS when PKCS option disabled
-rw-r--r--tdecore/tdehw/tdecryptographiccarddevice.cpp8
-rw-r--r--tdecore/tdehw/tdecryptographiccarddevice.h3
-rw-r--r--tdecore/tdehw/tdestoragedevice.h2
3 files changed, 9 insertions, 4 deletions
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp
index 8cf8092d9..43805ef55 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.cpp
+++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp
@@ -16,7 +16,9 @@
Boston, MA 02110-1301, USA.
*/
-#define _TDECRYPTOGRAPHICCARDDEVICE_INTERNAL 1
+#ifdef WITH_PKCS
+ #define _TDECRYPTOGRAPHICCARDDEVICE_INTERNAL 1
+#endif
#include "tdecryptographiccarddevice_private.h"
#include "tdecryptographiccarddevice.h"
@@ -227,10 +229,12 @@ TQString CryptoCardDeviceWatcher::getCardATR(TQString readerName) {
#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) {
vprintf(format, args);
printf("\n");
}
+#endif
int CryptoCardDeviceWatcher::retrieveCardCertificates(TQString readerName) {
#if WITH_PKCS
@@ -345,6 +349,7 @@ int CryptoCardDeviceWatcher::retrieveCardCertificates(TQString readerName) {
}
void CryptoCardDeviceWatcher::deleteAllCertificatesFromCache() {
+#ifdef WITH_PKCS
X509 *x509_cert;
X509CertificatePtrListIterator it;
@@ -354,6 +359,7 @@ void CryptoCardDeviceWatcher::deleteAllCertificatesFromCache() {
}
cardDevice->m_cardCertificates.clear();
+#endif
}
TDECryptographicCardDevice::TDECryptographicCardDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn),
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.h b/tdecore/tdehw/tdecryptographiccarddevice.h
index 299ad0741..fd0364fd8 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.h
+++ b/tdecore/tdehw/tdecryptographiccarddevice.h
@@ -1,4 +1,3 @@
-
/* This file is part of the TDE libraries
Copyright (C) 2015 Timothy Pearson <kb9vqf@pearsoncomputing.net>
@@ -46,7 +45,7 @@ class TDECORE_EXPORT TDECryptographicCardDevice : public TDEGenericDevice
* @param Device type
*/
TDECryptographicCardDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn=TQString::null);
-
+
/**
* Destructor.
*/
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h
index 24804e8c2..d3d797686 100644
--- a/tdecore/tdehw/tdestoragedevice.h
+++ b/tdecore/tdehw/tdestoragedevice.h
@@ -176,7 +176,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
* @param Device type
*/
TDEStorageDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn=TQString::null);
-
+
/**
* Destructor.
*/