[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=c522277

The following commit has been merged in the master branch:
commit c5222770fff5044dff2bc1e9d9ed1c52b3dd68ac
Author: Diane Trout <diane at ghic.org>
Date:   Tue Sep 24 15:54:01 2013 +0100

    Check for QCA certificate availability at run time.
    
    This fixes a crash if packagers don't include qca-ossl a runtime
    plugin for QCA needed to load SSL Certs.
    
    Note this introduces a new string inside the feature freeze
    
    Reviewed-by: David Edmundson
    CC:  kde-i18n-doc at kde.org
    BUG: 324750
---
 tls-cert-verifier-op.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tls-cert-verifier-op.cpp b/tls-cert-verifier-op.cpp
index b5bb19b..9ce9f51 100644
--- a/tls-cert-verifier-op.cpp
+++ b/tls-cert-verifier-op.cpp
@@ -93,9 +93,17 @@ void TlsCertVerifierOp::gotProperties(Tp::PendingOperation *op)
     // Initialize QCA module
     QCA::Initializer initializer;
 
+    if(!QCA::isSupported("cert")) {
+      setFinishedWithError(
+          QLatin1String("Cert.NoPlugin"),
+          i18n("The SSL/TLS support plugin is not available. "
+               "Certificate validation cannot be done."));
+      return;
+    }
+
     QCA::CertificateChain chain;
     Q_FOREACH (const QByteArray &data, m_certData) {
-       chain << QCA::Certificate::fromDER(data);
+        chain << QCA::Certificate::fromDER(data);
     }
 
     if (verifyCertChain(chain)) {

-- 
ktp-auth-handler packaging