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

Make luks helper functions non-static.

This commit is contained in:
Andrius Štikonas 2016-05-20 19:38:12 +01:00
parent 12bc2329a2
commit 7e8ee77edf
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/fs/luks.cpp
View File

@ -318,7 +318,7 @@ void luks::loadInnerFileSystem(const QString& deviceNode, const QString& mapperN
setLabel(m_innerFs->readLabel(mapperNode)); setLabel(m_innerFs->readLabel(mapperNode));
setUUID(m_innerFs->readUUID(mapperNode)); setUUID(m_innerFs->readUUID(mapperNode));
if (m_innerFs->supportGetUsed() == FileSystem::cmdSupportFileSystem) // FIXME:also implement checking space if partition is mounted if (m_innerFs->supportGetUsed() == FileSystem::cmdSupportFileSystem) // FIXME:also implement checking space if partition is mounted
setSectorsUsed(m_innerFs->readUsedCapacity(mapperNode)/m_logicalSectorSize + getPayloadOffset(deviceNode).toInt()); setSectorsUsed(m_innerFs->readUsedCapacity(mapperNode)/m_logicalSectorSize + getPayloadOffset(deviceNode));
} }
void luks::createInnerFileSystem(FileSystem::Type type) void luks::createInnerFileSystem(FileSystem::Type type)
@ -467,7 +467,7 @@ bool luks::resize(Report& report, const QString& deviceNode, qint64 newLength) c
if (mapperNode.isEmpty()) if (mapperNode.isEmpty())
return false; return false;
qint64 payloadLength = newLength - getPayloadOffset(deviceNode).toInt() * m_logicalSectorSize; qint64 payloadLength = newLength - getPayloadOffset(deviceNode) * m_logicalSectorSize;
if ( newLength - length() * m_logicalSectorSize > 0 ) if ( newLength - length() * m_logicalSectorSize > 0 )
{ {
ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"), { QStringLiteral("resize"), mapperNode }); ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"), { QStringLiteral("resize"), mapperNode });
@ -475,7 +475,7 @@ bool luks::resize(Report& report, const QString& deviceNode, qint64 newLength) c
if (cryptResizeCmd.run(-1) && cryptResizeCmd.exitCode() == 0) if (cryptResizeCmd.run(-1) && cryptResizeCmd.exitCode() == 0)
{ {
return m_innerFs->resize(report, mapperNode, newLength - getPayloadOffset(deviceNode).toInt() * m_logicalSectorSize); return m_innerFs->resize(report, mapperNode, newLength - getPayloadOffset(deviceNode) * m_logicalSectorSize);
} }
} }
else if (m_innerFs->resize(report, mapperNode, payloadLength)) else if (m_innerFs->resize(report, mapperNode, payloadLength))
@ -538,7 +538,7 @@ QString luks::mapperName(const QString& deviceNode)
return QString(); return QString();
} }
QString luks::getCipherName(const QString& deviceNode) QString luks::getCipherName(const QString& deviceNode) const
{ {
ExternalCommand cmd(QStringLiteral("cryptsetup"), ExternalCommand cmd(QStringLiteral("cryptsetup"),
{ QStringLiteral("luksDump"), deviceNode }); { QStringLiteral("luksDump"), deviceNode });
@ -551,7 +551,7 @@ QString luks::getCipherName(const QString& deviceNode)
return QStringLiteral("---"); return QStringLiteral("---");
} }
QString luks::getCipherMode(const QString& deviceNode) QString luks::getCipherMode(const QString& deviceNode) const
{ {
ExternalCommand cmd(QStringLiteral("cryptsetup"), ExternalCommand cmd(QStringLiteral("cryptsetup"),
{ QStringLiteral("luksDump"), deviceNode }); { QStringLiteral("luksDump"), deviceNode });
@ -564,7 +564,7 @@ QString luks::getCipherMode(const QString& deviceNode)
return QStringLiteral("---"); return QStringLiteral("---");
} }
QString luks::getHashName(const QString& deviceNode) QString luks::getHashName(const QString& deviceNode) const
{ {
ExternalCommand cmd(QStringLiteral("cryptsetup"), ExternalCommand cmd(QStringLiteral("cryptsetup"),
{ QStringLiteral("luksDump"), deviceNode }); { QStringLiteral("luksDump"), deviceNode });
@ -577,7 +577,7 @@ QString luks::getHashName(const QString& deviceNode)
return QStringLiteral("---"); return QStringLiteral("---");
} }
QString luks::getKeySize(const QString& deviceNode) qint64 luks::getKeySize(const QString& deviceNode) const
{ {
ExternalCommand cmd(QStringLiteral("cryptsetup"), ExternalCommand cmd(QStringLiteral("cryptsetup"),
{ QStringLiteral("luksDump"), deviceNode }); { QStringLiteral("luksDump"), deviceNode });
@ -585,12 +585,12 @@ QString luks::getKeySize(const QString& deviceNode)
QRegularExpression re(QStringLiteral("MK bits:\\s+(\\d+)")); QRegularExpression re(QStringLiteral("MK bits:\\s+(\\d+)"));
QRegularExpressionMatch reKeySize = re.match(cmd.output()); QRegularExpressionMatch reKeySize = re.match(cmd.output());
if (reKeySize.hasMatch()) if (reKeySize.hasMatch())
return reKeySize.captured(1); return reKeySize.captured(1).toLongLong();
} }
return QStringLiteral("---"); return -1;
} }
QString luks::getPayloadOffset(const QString& deviceNode) qint64 luks::getPayloadOffset(const QString& deviceNode) const
{ {
ExternalCommand cmd(QStringLiteral("cryptsetup"), ExternalCommand cmd(QStringLiteral("cryptsetup"),
{ QStringLiteral("luksDump"), deviceNode }); { QStringLiteral("luksDump"), deviceNode });
@ -598,9 +598,9 @@ QString luks::getPayloadOffset(const QString& deviceNode)
QRegularExpression re(QStringLiteral("Payload offset:\\s+(\\d+)")); QRegularExpression re(QStringLiteral("Payload offset:\\s+(\\d+)"));
QRegularExpressionMatch rePayloadOffset = re.match(cmd.output()); QRegularExpressionMatch rePayloadOffset = re.match(cmd.output());
if (rePayloadOffset.hasMatch()) if (rePayloadOffset.hasMatch())
return rePayloadOffset.captured(1); return rePayloadOffset.captured(1).toLongLong();
} }
return QStringLiteral("---"); return -1;
} }
bool luks::canEncryptType(FileSystem::Type type) bool luks::canEncryptType(FileSystem::Type type)

10
src/fs/luks.h
View File

@ -151,11 +151,11 @@ public:
static QString mapperName(const QString& deviceNode); static QString mapperName(const QString& deviceNode);
static QString getCipherName(const QString& deviceNode); QString getCipherName(const QString& deviceNode) const;
static QString getCipherMode(const QString& deviceNode); QString getCipherMode(const QString& deviceNode) const;
static QString getHashName(const QString& deviceNode); QString getHashName(const QString& deviceNode) const;
static QString getKeySize(const QString& deviceNode); qint64 getKeySize(const QString& deviceNode) const;
static QString getPayloadOffset(const QString& deviceNode); qint64 getPayloadOffset(const QString& deviceNode) const;
static bool canEncryptType(FileSystem::Type type); static bool canEncryptType(FileSystem::Type type);
protected: protected: