projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make authenticator changes to protocol backwards-compatible
[quassel.git]
/
src
/
client
/
clientauthhandler.h
diff --git
a/src/client/clientauthhandler.h
b/src/client/clientauthhandler.h
index
f6f2fc9
..
d6e54cd
100644
(file)
--- a/
src/client/clientauthhandler.h
+++ b/
src/client/clientauthhandler.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-36,6
+36,12
@@
class ClientAuthHandler : public AuthHandler
public:
ClientAuthHandler(CoreAccount account, QObject *parent = 0);
public:
ClientAuthHandler(CoreAccount account, QObject *parent = 0);
+ enum DigestVersion {
+ Md5,
+ Sha2_512,
+ Latest=Sha2_512
+ };
+
public slots:
void connectToCore();
public slots:
void connectToCore();
@@
-64,7
+70,7
@@
signals:
#endif
void encrypted(bool isEncrypted = true);
#endif
void encrypted(bool isEncrypted = true);
- void startCoreSetup(const QVariantList &backendInfo);
+ void startCoreSetup(const QVariantList &backendInfo
, const QVariantList &authBackendInfo
);
void coreSetupSuccessful();
void coreSetupFailed(const QString &error);
void coreSetupSuccessful();
void coreSetupFailed(const QString &error);
@@
-83,6
+89,10
@@
private:
void checkAndEnableSsl(bool coreSupportsSsl);
void startRegistration();
void checkAndEnableSsl(bool coreSupportsSsl);
void startRegistration();
+#if QT_VERSION < 0x050000
+ QByteArray sha2_512(const QByteArray &input);
+#endif
+
private slots:
void onSocketConnected();
void onSocketStateChanged(QAbstractSocket::SocketState state);
private slots:
void onSocketConnected();
void onSocketStateChanged(QAbstractSocket::SocketState state);
@@
-103,6
+113,7
@@
private:
RemotePeer *_peer;
bool _coreConfigured;
QVariantList _backendInfo;
RemotePeer *_peer;
bool _coreConfigured;
QVariantList _backendInfo;
+ QVariantList _authBackendInfo;
CoreAccount _account;
bool _probing;
bool _legacy;
CoreAccount _account;
bool _probing;
bool _legacy;