From 64b0cf4c771fca8b379538d04d0c8ee3c9ad4b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 9 May 2016 11:07:31 +0100
Subject: [PATCH] Unbreak non ASCII passphrases.

---
 src/fs/luks.cpp                            | 7 ++++---
 src/plugins/libparted/libpartedbackend.cpp | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp
index 3ffae65..61449dc 100644
--- a/src/fs/luks.cpp
+++ b/src/fs/luks.cpp
@@ -119,7 +119,7 @@ bool luks::create(Report& report, const QString& deviceNode) const
                                 QStringLiteral("luksFormat"),
                                 deviceNode });
     if (!( createCmd.start(-1) &&
-                createCmd.write(m_passphrase.toLatin1() + '\n' + m_passphrase.toLatin1() + '\n') == 2*(m_passphrase.toLatin1().length() + 1) &&
+                createCmd.write(m_passphrase.toUtf8() + '\n' + m_passphrase.toUtf8() + '\n') == 2*(m_passphrase.toUtf8().length() + 1) &&
                 createCmd.waitFor() && createCmd.exitCode() == 0))
     {
         return false;
@@ -130,7 +130,7 @@ bool luks::create(Report& report, const QString& deviceNode) const
                                 deviceNode,
                                 suggestedMapperName(deviceNode) });
 
-    if (!( openCmd.start(-1) &&  openCmd.write(m_passphrase.toLatin1() + '\n') == m_passphrase.toLatin1().length() + 1 && openCmd.waitFor()))
+    if (!( openCmd.start(-1) &&  openCmd.write(m_passphrase.toUtf8() + '\n') == m_passphrase.toUtf8().length() + 1 && openCmd.waitFor()))
         return false;
 
     QString mapperNode = mapperName(deviceNode);
@@ -255,8 +255,9 @@ bool luks::cryptOpen(QWidget* parent, const QString& deviceNode)
                                 deviceNode,
                                 suggestedMapperName(deviceNode) });
 
+    qDebug() << passphrase.toUtf8();
     if (!( openCmd.start(-1) &&
-                    openCmd.write(passphrase.toLatin1() + '\n') == passphrase.toLatin1().length() + 1 &&
+                    openCmd.write(passphrase.toUtf8() + '\n') == passphrase.toUtf8().length() + 1 &&
                     openCmd.waitFor() && openCmd.exitCode() == 0) )
     {
         return false;
diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp
index f430f10..eae3865 100644
--- a/src/plugins/libparted/libpartedbackend.cpp
+++ b/src/plugins/libparted/libpartedbackend.cpp
@@ -41,9 +41,9 @@
 
 #include <blkid/blkid.h>
 
+#include <QDebug>
 #include <QString>
 #include <QStringList>
-#include <QDebug>
 
 #include <KLocalizedString>
 #include <KIOCore/KMountPoint>