projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert the Storage::HashVersion names to CamelCase
[quassel.git]
/
src
/
core
/
storage.h
diff --git
a/src/core/storage.h
b/src/core/storage.h
index
9371529
..
9b9ce4f
100644
(file)
--- a/
src/core/storage.h
+++ b/
src/core/storage.h
@@
-43,8
+43,13
@@
public:
};
enum HashVersion {
};
enum HashVersion {
- sha1,
- latest=sha1
+ Sha1,
+#if QT_VERSION >= 0x050000
+ Sha2_512,
+ Latest=Sha2_512
+#else
+ Latest=Sha1
+#endif
};
public slots:
};
public slots:
@@
-419,6
+424,11
@@
protected:
private:
QString hashPasswordSha1(const QString &password);
bool checkHashedPasswordSha1(const QString &password, const QString &hashedPassword);
private:
QString hashPasswordSha1(const QString &password);
bool checkHashedPasswordSha1(const QString &password, const QString &hashedPassword);
+
+#if QT_VERSION >= 0x050000
+ QString hashPasswordSha2_512(const QString &password);
+ bool checkHashedPasswordSha2_512(const QString &password, const QString &hashedPassword);
+#endif
};
};