From dfe4746c99b13c9a725f5a32d153fc23bfd3fead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 26 Apr 2011 07:02:29 +0000
Subject: [PATCH] find SuisseID certs; refs #32

---
 swisssurfer/src/smartcardauth.hxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/swisssurfer/src/smartcardauth.hxx b/swisssurfer/src/smartcardauth.hxx
index 141fd03..18721f7 100644
--- a/swisssurfer/src/smartcardauth.hxx
+++ b/swisssurfer/src/smartcardauth.hxx
@@ -49,7 +49,8 @@ class CryptokiEngine: public openssl::Engine {
                               (QByteArray(data.data(), data.size()),
                                QSsl::Der));
           } else {
-            if (label.value.find("auth")==0) {
+            if (label.value.find("auth")==0 ||
+                label.value.find("Authentication"<std::string::npos)) {
               std::string data(cert->attribute(CKA_VALUE).value);
               QSslCertificate c(QByteArray(data.data(), data.size()),
                                 QSsl::Der);
@@ -221,9 +222,11 @@ class SmartCardAuth: public QObject {
     }
 
     static int clientCert(SSL* ssl, X509 **x509, EVP_PKEY **pkey) {
-      qDebug()<<__PRETTY_FUNCTION__;
+      qDebug()<<"*** A "<<__PRETTY_FUNCTION__;
       *x509 = e()->cert().lowLevelCopy();
+      qDebug()<<"*** B "<<__PRETTY_FUNCTION__;
       *pkey = e()->privkey(0, 0, 0);
+      qDebug()<<"*** C "<<__PRETTY_FUNCTION__;
       return 1;
     }