chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cache DS2 keys during import for a 3x speedup.

Browse Source 
Crypto overhead now makes import take only twice as long, instead of
of 22x before optimization.
This commit is contained in:
sawinglogz 2021-12-06 16:14:11 -05:00
parent be24a3ec4f
commit eac13160b9
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -254,7 +254,7 @@ const char* PRS1ModelInfo::Name(const QString & model) const
class PRDS2File : public RawDataFile class PRDS2File : public RawDataFile
{ {
public: public:
PRDS2File(class QFile & file); PRDS2File(class QFile & file, QHash<QByteArray,QByteArray> & keycache);
virtual ~PRDS2File() {}; virtual ~PRDS2File() {};
bool isValid() const; bool isValid() const;
QString guid() const; QString guid() const;
@ -282,12 +282,21 @@ class PRDS2File : public RawDataFile
static const int m_header_size = 0xCA; static const int m_header_size = 0xCA;
}; };
PRDS2File::PRDS2File(class QFile & file) PRDS2File::PRDS2File(class QFile & file, QHash<QByteArray,QByteArray> & keycache)
: RawDataFile(file) : RawDataFile(file)
{ {
bool valid = parseDS2Header(); bool valid = parseDS2Header();
if (valid) { if (valid) {
valid = initializeKey(); QByteArray key = m_iv + m_salt + m_export_key + m_export_key_tag;
m_payload_key = keycache[key];
if (m_payload_key.isEmpty()) {
// Derive the key (slow).
valid = initializeKey();
if (valid) {
// Cache the result for the next file.
keycache[key] = m_payload_key;
}
}
if (valid) { if (valid) {
valid = decryptData(); valid = decryptData();
} }
@ -668,7 +677,7 @@ bool PRS1Loader::PeekProperties(const QString & filename, QHash<QString,QString>
RawDataFile* src; RawDataFile* src;
if (QFileInfo(f).suffix().toUpper() == "BIN") { if (QFileInfo(f).suffix().toUpper() == "BIN") {
// If it's a DS2 file, insert the DS2 wrapper to decode the chunk stream. // If it's a DS2 file, insert the DS2 wrapper to decode the chunk stream.
PRDS2File* ds2 = new PRDS2File(f); PRDS2File* ds2 = new PRDS2File(f, m_keycache);
if (!ds2->isValid()) { if (!ds2->isValid()) {
//qWarning() << filename << "unable to decrypt"; //qWarning() << filename << "unable to decrypt";
delete ds2; delete ds2;
@ -914,6 +923,8 @@ int PRS1Loader::FindSessionDirsAndProperties(const QString & path, QStringList &
bool PRS1Loader::CreateMachineFromProperties(QString propertyfile) bool PRS1Loader::CreateMachineFromProperties(QString propertyfile)
{ {
m_keycache.clear();
MachineInfo info = newInfo(); MachineInfo info = newInfo();
QHash<QString,QString> props; QHash<QString,QString> props;
if (!PeekProperties(propertyfile, props) || !s_PRS1ModelInfo.IsSupported(props)) { if (!PeekProperties(propertyfile, props) || !s_PRS1ModelInfo.IsSupported(props)) {
@ -2720,7 +2731,7 @@ QList<PRS1DataChunk *> PRS1Loader::ParseFile(const QString & path)
RawDataFile* src; RawDataFile* src;
if (QFileInfo(f).suffix().toUpper().startsWith("B")) { // .B01, .B02, etc. if (QFileInfo(f).suffix().toUpper().startsWith("B")) { // .B01, .B02, etc.
// If it's a DS2 file, insert the DS2 wrapper to decode the chunk stream. // If it's a DS2 file, insert the DS2 wrapper to decode the chunk stream.
PRDS2File* ds2 = new PRDS2File(f); PRDS2File* ds2 = new PRDS2File(f, m_keycache);
if (!ds2->isValid()) { if (!ds2->isValid()) {
//qWarning() << path << "unable to decrypt"; //qWarning() << path << "unable to decrypt";
delete ds2; delete ds2;

3
oscar/SleepLib/loader_plugins/prs1_loader.h
View File

@ -228,6 +228,9 @@ class PRS1Loader : public CPAPLoader
//! \brief PRS1 Data files can store multiple sessions, so store them in this list for later processing. //! \brief PRS1 Data files can store multiple sessions, so store them in this list for later processing.
QHash<SessionID, Session *> new_sessions; QHash<SessionID, Session *> new_sessions;
//! \brief DS2 key derivation is very slow, but keys are reused in multiple files, so we cache the derived keys.
QHash<QByteArray, QByteArray> m_keycache;
}; };