Fixed FTBFS caused by libcryptsetup 2.0

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

2 files changed, 0 insertions, 22 deletions

diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index 58c97e5c6..6c82efb2b 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 b5922eec9..78e215730 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;