diff options
| author | Melvin Keskin <melvo@olomono.de> | 2021-10-07 16:35:50 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2021-10-10 20:12:46 +0200 |
| commit | e4970a79535dd5cfff2d010049cf39b644a87850 (patch) | |
| tree | f274962b1063012ce0482e9e7328070bec69fba0 /src/client/QXmppTrustStorage.cpp | |
| parent | e1836d08b2f659d2ac5c98280e08d96c8df60d88 (diff) | |
| download | qxmpp-e4970a79535dd5cfff2d010049cf39b644a87850.tar.gz | |
Update to OMEMO 0.8, TM 0.6 and ATM 0.4
* OMEMO has namespace 'urn:xmpp:omemo:2' and uses SCE 0.4 now
* TM has namespace 'urn:xmpp:tm:1' and uses Base64 for key identifiers
* ATM uses Base64 for key identifiers
Diffstat (limited to 'src/client/QXmppTrustStorage.cpp')
| -rw-r--r-- | src/client/QXmppTrustStorage.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/client/QXmppTrustStorage.cpp b/src/client/QXmppTrustStorage.cpp index 51ebea82..369470a4 100644 --- a/src/client/QXmppTrustStorage.cpp +++ b/src/client/QXmppTrustStorage.cpp @@ -57,7 +57,7 @@ /// /// -/// \fn QXmppTrustStorage::addOwnKey(const QString &encryption, const QString &keyId) +/// \fn QXmppTrustStorage::addOwnKey(const QString &encryption, const QByteArray &keyId) /// /// Adds an own key (i.e., the key used by this client instance). /// @@ -84,7 +84,7 @@ /// /// -/// \fn QXmppTrustStorage::addKeys(const QString &encryption, const QString &keyOwnerJid, const QList<QString> &keyIds, const QXmppTrustStorage::TrustLevel trustLevel) +/// \fn QXmppTrustStorage::addKeys(const QString &encryption, const QString &keyOwnerJid, const QList<QByteArray> &keyIds, const QXmppTrustStorage::TrustLevel trustLevel) /// /// Adds keys. /// @@ -95,7 +95,7 @@ /// /// -/// \fn QXmppTrustStorage::removeKeys(const QString &encryption, const QList<QString> &keyIds) +/// \fn QXmppTrustStorage::removeKeys(const QString &encryption, const QList<QByteArray> &keyIds) /// /// Removes keys. /// @@ -121,7 +121,7 @@ /// /// -/// \fn QXmppTrustStorage::setTrustLevel(const QString &encryption, const QMultiHash<QString, QString> &keyIds, TrustLevel trustLevel) +/// \fn QXmppTrustStorage::setTrustLevel(const QString &encryption, const QMultiHash<QString, QByteArray> &keyIds, TrustLevel trustLevel) /// /// Sets the trust level of keys. /// @@ -144,7 +144,7 @@ /// /// -/// \fn QXmppTrustStorage::trustLevel(const QString &encryption, const QString &keyId) +/// \fn QXmppTrustStorage::trustLevel(const QString &encryption, const QByteArray &keyId) /// /// Returns the trust level of a key. /// @@ -157,7 +157,7 @@ /// /// -/// \fn QXmppTrustStorage::addKeysForPostponedTrustDecisions(const QString &encryption, const QString &senderKeyId, const QList<QXmppTrustMessageKeyOwner> &keyOwners) +/// \fn QXmppTrustStorage::addKeysForPostponedTrustDecisions(const QString &encryption, const QByteArray &senderKeyId, const QList<QXmppTrustMessageKeyOwner> &keyOwners) /// /// Adds keys that cannot be authenticated or distrusted directly because the /// key of the trust message's sender is not yet authenticated. @@ -181,7 +181,7 @@ /// /// -/// \fn QXmppTrustStorage::removeKeysForPostponedTrustDecisions(const QString &encryption, const QList<QString> &keyIdsForAuthentication, const QList<QString> &keyIdsForDistrusting) +/// \fn QXmppTrustStorage::removeKeysForPostponedTrustDecisions(const QString &encryption, const QList<QByteArray> &keyIdsForAuthentication, const QList<QByteArray> &keyIdsForDistrusting) /// /// Removes keys for postponed authentication or distrusting. /// @@ -191,7 +191,7 @@ /// /// -/// \fn QXmppTrustStorage::removeKeysForPostponedTrustDecisions(const QString &encryption = {}, const QList<QString> &senderKeyIds = {}) +/// \fn QXmppTrustStorage::removeKeysForPostponedTrustDecisions(const QString &encryption = {}, const QList<QByteArray> &senderKeyIds = {}) /// /// Removes keys for postponed authentication or distrusting by the trust /// message's sender's key ID. @@ -204,7 +204,7 @@ /// /// -/// \fn QXmppTrustStorage::keysForPostponedTrustDecisions(const QString &encryption, const QList<QString> &senderKeyIds = {}) +/// \fn QXmppTrustStorage::keysForPostponedTrustDecisions(const QString &encryption, const QList<QByteArray> &senderKeyIds = {}) /// /// Returns the JIDs of key owners mapped to the IDs of their keys stored for /// postponed authentication (true) or postponed distrusting (false). |
