andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Add FS::luks::outerUuid().

This commit is contained in:
Teo Mrnjavac 2016-11-29 19:12:27 +01:00
parent 7155c5661b
commit 5e40017238
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fs/luks.cpp
View File

@ -525,7 +525,9 @@ QString luks::readOuterUUID(const QString &deviceNode) const
<< "\toutput:" << cmd.output().trimmed();
return QString();
}
return cmd.output().trimmed();
QString outerUuid = cmd.output().trimmed();
const_cast< QString& >( m_outerUuid ) = outerUuid;
return outerUuid;
}
return QStringLiteral("---");
}
@ -611,6 +613,11 @@ void luks::getLuksInfo(const QString& deviceNode)
}
}
QString luks::outerUuid() const
{
return m_outerUuid;
}
bool luks::canEncryptType(FileSystem::Type type)
{
switch (type)

14
src/fs/luks.h
View File

@ -171,13 +171,14 @@ public:
void getLuksInfo(const QString& deviceNode);
FileSystem* innerFS() const { return m_innerFs; }; // avoid calling this unless necessary
QString outerUuid() const;
QString mapperName() const { return m_MapperName; };
QString cipherName() const { return m_CipherName; };
QString cipherMode() const { return m_CipherMode; };
QString hashName() const { return m_HashName; };
qint64 keySize() const { return m_KeySize; };
qint64 payloadOffset() const { return m_PayloadOffset; };
QString mapperName() const { return m_MapperName; }
QString cipherName() const { return m_CipherName; }
QString cipherMode() const { return m_CipherMode; }
QString hashName() const { return m_HashName; }
qint64 keySize() const { return m_KeySize; }
qint64 payloadOffset() const { return m_PayloadOffset; }
static bool canEncryptType(FileSystem::Type type);
static void initLUKS(FileSystem* fs);
@ -214,6 +215,7 @@ private:
QString m_HashName;
qint64 m_KeySize;
qint64 m_PayloadOffset;
QString m_outerUuid;
};
}