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/base/QXmppOmemoData.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/base/QXmppOmemoData.cpp')
| -rw-r--r-- | src/base/QXmppOmemoData.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/base/QXmppOmemoData.cpp b/src/base/QXmppOmemoData.cpp index fbcf8261..46932f03 100644 --- a/src/base/QXmppOmemoData.cpp +++ b/src/base/QXmppOmemoData.cpp @@ -163,7 +163,7 @@ void QXmppOmemoDeviceElement::toXml(QXmlStreamWriter *writer) const bool QXmppOmemoDeviceElement::isOmemoDeviceElement(const QDomElement &element) { return element.tagName() == QStringLiteral("device") && - element.namespaceURI() == ns_omemo_1; + element.namespaceURI() == ns_omemo_2; } /// @@ -213,7 +213,7 @@ void QXmppOmemoDeviceList::parse(const QDomElement &element) void QXmppOmemoDeviceList::toXml(QXmlStreamWriter *writer) const { writer->writeStartElement("devices"); - writer->writeDefaultNamespace(ns_omemo_1); + writer->writeDefaultNamespace(ns_omemo_2); for (const auto &device : *this) { device.toXml(writer); @@ -233,7 +233,7 @@ void QXmppOmemoDeviceList::toXml(QXmlStreamWriter *writer) const bool QXmppOmemoDeviceList::isOmemoDeviceList(const QDomElement &element) { return element.tagName() == QStringLiteral("devices") && - element.namespaceURI() == ns_omemo_1; + element.namespaceURI() == ns_omemo_2; } /// @@ -427,7 +427,7 @@ void QXmppOmemoDeviceBundle::parse(const QDomElement &element) void QXmppOmemoDeviceBundle::toXml(QXmlStreamWriter *writer) const { writer->writeStartElement(QStringLiteral("bundle")); - writer->writeDefaultNamespace(ns_omemo_1); + writer->writeDefaultNamespace(ns_omemo_2); writer->writeStartElement(QStringLiteral("ik")); writer->writeCharacters(publicIdentityKey().toBase64()); @@ -465,7 +465,7 @@ void QXmppOmemoDeviceBundle::toXml(QXmlStreamWriter *writer) const bool QXmppOmemoDeviceBundle::isOmemoDeviceBundle(const QDomElement &element) { return element.tagName() == QStringLiteral("bundle") && - element.namespaceURI() == ns_omemo_1; + element.namespaceURI() == ns_omemo_2; } /// @@ -617,7 +617,7 @@ void QXmppOmemoEnvelope::toXml(QXmlStreamWriter *writer) const bool QXmppOmemoEnvelope::isOmemoEnvelope(const QDomElement &element) { return element.tagName() == QStringLiteral("key") && - element.namespaceURI() == ns_omemo_1; + element.namespaceURI() == ns_omemo_2; } /// @@ -767,7 +767,7 @@ void QXmppOmemoElement::parse(const QDomElement &element) void QXmppOmemoElement::toXml(QXmlStreamWriter *writer) const { writer->writeStartElement("encrypted"); - writer->writeAttribute("xmlns", ns_omemo_1); + writer->writeAttribute("xmlns", ns_omemo_2); writer->writeStartElement("header"); writer->writeAttribute("sid", QString::number(d->senderDeviceId)); @@ -803,5 +803,5 @@ void QXmppOmemoElement::toXml(QXmlStreamWriter *writer) const bool QXmppOmemoElement::isOmemoElement(const QDomElement &element) { return element.tagName() == QStringLiteral("encrypted") && - element.namespaceURI() == ns_omemo_1; + element.namespaceURI() == ns_omemo_2; } |