Merge branch '1.9'

Author: lnjX

CHANGELOG.md

@@ -9,6 +9,14 @@ QXmpp 1.10.0 (UNRELEASED)
 
 *under development*
 
+QXmpp 1.9.3 (January 23, 2025)
+------------------------------
+
+ - OutgoingClient: Fix ssl connection/setting invalid ssl config (@pasnox, #675)
+ - FileEncryption: Fix wrong Cipher::ok() assert (@pasnox, #676)
+ - OmemoManager: Fix removing old signed pre key pairs (@melvo, #674)
+ - OmemoManager: Do not try to renew signed pre key pairs while loading (@melvo, #674)
+
 QXmpp 1.9.2 (December 07, 2024)
 -------------------------------
 

doc/doap.xml

@@ -741,6 +741,13 @@ SPDX-License-Identifier: CC0-1.0
         <xmpp:since>1.8</xmpp:since>
       </xmpp:SupportedXep>
     </implements>
+    <release>
+      <Version>
+        <revision>1.9.3</revision>
+        <created>2025-01-23</created>
+        <file-release rdf:resource='https://github.com/qxmpp-project/qxmpp/archive/refs/tags/v1.9.3.tar.gz'/>
+      </Version>
+    </release>
     <release>
       <Version>
         <revision>1.9.2</revision>

src/client/QXmppFileEncryption.cpp

@@ -154,7 +154,6 @@ EncryptionDevice::EncryptionDevice(std::unique_ptr<QIODevice> input,
     setOpenMode(m_input->openMode() & QIODevice::ReadOnly);
 
     Q_ASSERT(m_cipher->validKeyLength(int(key.length())));
-    Q_ASSERT(m_cipher->ok());
 }
 
 EncryptionDevice::~EncryptionDevice() = default;
@@ -270,7 +269,6 @@ DecryptionDevice::DecryptionDevice(std::unique_ptr<QIODevice> input,
     setOpenMode(m_output->openMode() & QIODevice::WriteOnly);
 
     Q_ASSERT(m_cipher->validKeyLength(int(key.length())));
-    Q_ASSERT(m_cipher->ok());
 }
 
 DecryptionDevice::~DecryptionDevice() = default;

src/client/QXmppOutgoingClient.cpp

@@ -130,7 +130,7 @@ QXmppOutgoingClientPrivate::QXmppOutgoingClientPrivate(QXmppOutgoingClient *qq)
 
 void QXmppOutgoingClientPrivate::connectToHost(const ServerAddress &address)
 {
-    QSslConfiguration sslConfig;
+    auto sslConfig = QSslConfiguration::defaultConfiguration();
 
     // override CA certificates if requested
     if (!config.caCertificates().isEmpty()) {