[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=681125a

The following commit has been merged in the master branch:
commit 681125af33afca8f9ee965e93578f17b990a7ea7
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Feb 6 16:25:56 2013 +0100

    setFinishedWithError() when certificate is not x.509
---
 tls-cert-verifier-op.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tls-cert-verifier-op.cpp b/tls-cert-verifier-op.cpp
index cc19fad..be5abda 100644
--- a/tls-cert-verifier-op.cpp
+++ b/tls-cert-verifier-op.cpp
@@ -79,7 +79,12 @@ void TlsCertVerifierOp::gotProperties(Tp::PendingOperation *op)
     m_certData = qdbus_cast<CertificateDataList>(props.value(QLatin1String("CertificateChainData")));
 
     if(m_certType.compare(QLatin1String("x509"), Qt::CaseInsensitive)) {
-        kWarning() << "This is not an x509 certificate";
+        Tp::TLSCertificateRejectionList rejections;
+        m_authTLSCertificateIface->Reject(rejections);
+        m_channel->requestClose();
+        setFinishedWithError(QLatin1String("Cert.Unknown"),
+                             QLatin1String("Invalid certificate type"));
+        return;
     }
 
     // Initialize QCA module
@@ -87,7 +92,6 @@ void TlsCertVerifierOp::gotProperties(Tp::PendingOperation *op)
 
     QCA::CertificateChain chain;
     Q_FOREACH (const QByteArray &data, m_certData) {
-        // FIXME How to check if it is QSsl::Pem or QSsl::Der? QSsl::Der works for kdetalk
         chain << QCA::Certificate::fromDER(data);
     }
 

-- 
ktp-auth-handler packaging