summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-02-25 09:44:37 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2018-02-25 09:44:37 (GMT)
commit706098c452fbe8a0626e46279e9f16b773679af7 (patch)
treefad7331a90320ca1c6547ef7a2639f6d7b44a40b
parenta14adb9ab9c50cbcd95a2d2e3f42c41fecf73fb0 (diff)
downloadtdelibs-706098c4.zip
tdelibs-706098c4.tar.gz
Fixed FTBFS caused by libcryptsetup 2.0
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--tdecore/tdehw/tdestoragedevice.cpp16
-rw-r--r--tdecore/tdehw/tdestoragedevice.h6
2 files changed, 0 insertions, 22 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index 58c97e5..6c82efb 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -75,21 +75,6 @@
TQT_DBusData convertDBUSDataToVariantData(TQT_DBusData);
#endif // defined(WITH_UDISKS) || defined(WITH_UDISKS2)
-#if defined(WITH_CRYPTSETUP)
-int TDEStorageDevice::cryptsetup_password_entry_callback(const char *msg, char *buf, size_t length, void *usrptr) {
- TDEStorageDevice* sdevice = (TDEStorageDevice*)usrptr;
-
- unsigned int passwd_len = sdevice->m_cryptDevicePassword.size();
- if (passwd_len < length) {
- memcpy(buf, sdevice->m_cryptDevicePassword.data(), length);
- return passwd_len;
- }
- else {
- return -1;
- }
-}
-#endif
-
TDEStorageDevice::TDEStorageDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), m_mediaInserted(true), m_cryptDevice(NULL) {
m_diskType = TDEDiskDeviceType::Null;
m_diskStatus = TDEDiskDeviceStatus::Null;
@@ -142,7 +127,6 @@ void TDEStorageDevice::internalInitializeLUKSIfNeeded() {
if (node != "") {
ret = crypt_init(&m_cryptDevice, node.ascii());
if (ret == 0) {
- crypt_set_password_callback(m_cryptDevice, TDEStorageDevice::cryptsetup_password_entry_callback, this);
ret = crypt_load(m_cryptDevice, NULL, NULL);
if (ret == 0) {
int keyslot_count;
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h
index b5922ee..78e2157 100644
--- a/tdecore/tdehw/tdestoragedevice.h
+++ b/tdecore/tdehw/tdestoragedevice.h
@@ -492,12 +492,6 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
void internalGetLUKSKeySlotStatus();
private:
- /**
- * @internal
- */
- static int cryptsetup_password_entry_callback(const char*, char *, size_t, void *);
-
- private:
TDEDiskDeviceType::TDEDiskDeviceType m_diskType;
TDEDiskDeviceStatus::TDEDiskDeviceStatus m_diskStatus;
TQString m_diskName;