diff options
| author | Javier S. Pedro <maemo@javispedro.com> | 2012-09-30 23:56:06 +0200 |
|---|---|---|
| committer | Javier S. Pedro <maemo@javispedro.com> | 2012-09-30 23:56:06 +0200 |
| commit | c0183326a6447f931d4ec971963633a687e12c5e (patch) | |
| tree | 93d69414784fc9f60dd9805c7480d345c05b853e /distfoldd/agent.cc | |
| parent | eafd6be17a1bf1e6518180ffbc401cc0eacc332f (diff) | |
| download | distfold-c0183326a6447f931d4ec971963633a687e12c5e.tar.gz distfold-c0183326a6447f931d4ec971963633a687e12c5e.zip | |
prevent trivial mitm attack
Diffstat (limited to 'distfoldd/agent.cc')
| -rw-r--r-- | distfoldd/agent.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/distfoldd/agent.cc b/distfoldd/agent.cc index 8baa85b..1087889 100644 --- a/distfoldd/agent.cc +++ b/distfoldd/agent.cc @@ -175,9 +175,12 @@ QByteArray Agent::generateChallenge() return QCA::Random::randomArray(challenge_size).toByteArray(); } -QByteArray Agent::generateChallengeResponse(const QByteArray& server_challenge, const QByteArray& client_challenge) +QByteArray Agent::generateChallengeResponse(const QByteArray& server_challenge, const QByteArray& client_challenge, const QSslCertificate& server_cert, const QSslCertificate& client_cert) { - return hmacSha1(_passwd.toUtf8(), server_challenge + client_challenge); + QByteArray server_digest = server_cert.digest(QCryptographicHash::Sha1); + QByteArray client_digest = client_cert.digest(QCryptographicHash::Sha1); + return hmacSha1(_passwd.toUtf8(), server_challenge + server_digest + + client_challenge + client_digest); } QByteArray Agent::encodeAuthReply(AuthResult result) |