updated pica-client to make it handle new id format. quint32 type for id is replaced with QByteArray in most places. Implemented verification callbacks in client and node that allow self-signed certificates

git-svn-id: svn://localhost/project_picapica/trunk@266 fb96df88-216d-11de-830c-f3023f12d8ac

3 files changed, 5 insertions, 5 deletions

diff --git a/pica-client/dialogs/addaccountdialog.cpp b/pica-client/dialogs/addaccountdialog.cpp
index 97e8851..8d31ca4 100644
--- a/pica-client/dialogs/addaccountdialog.cpp
+++ b/pica-client/dialogs/addaccountdialog.cpp
@@ -68,9 +68,9 @@ void AddAccountDialog::OK()
             return;
         }
 
-        quint32 id;
+        QByteArray id(PICA_ID_SIZE, 0);
 
-        if (!PICA_get_id_from_cert(cert_filename->text().toUtf8().constData(),&id))
+        if (!PICA_get_id_from_cert_file(cert_filename->text().toUtf8().constData(), (unsigned char*)id.data()))
         {
             QMessageBox mbx;
             mbx.setText(tr("Invalid certificate file"));
diff --git a/pica-client/dialogs/forgedcertdialog.cpp b/pica-client/dialogs/forgedcertdialog.cpp
index 5ca7f23..ccf144f 100644
--- a/pica-client/dialogs/forgedcertdialog.cpp
+++ b/pica-client/dialogs/forgedcertdialog.cpp
@@ -3,7 +3,7 @@
 #include <QGridLayout>
 #include <QLabel>
 
-ForgedCertDialog::ForgedCertDialog(quint32 peer_id, QString received_cert, QString stored_cert, QWidget *parent) :
+ForgedCertDialog::ForgedCertDialog(QByteArray peer_id, QString received_cert, QString stored_cert, QWidget *parent) :
     QDialog(parent),
     received_cert_(received_cert),
     stored_cert_(stored_cert)
@@ -14,7 +14,7 @@ ForgedCertDialog::ForgedCertDialog(quint32 peer_id, QString received_cert, QStri
 "Previously stored and currently present certificates for user %1 do not match.\n\
 This means that probably someone is trying to eavesdrop your communication\n\
 using man-in-the-middle attack or impersonate the user.\n\
-Connection aborted.").arg(peer_id));
+Connection aborted.").arg(peer_id.toBase64().constData()));
 
     btOK = new QPushButton(tr("OK"));
     btShow_stored_cert = new QPushButton(tr("View Stored Certificate..."));
diff --git a/pica-client/dialogs/forgedcertdialog.h b/pica-client/dialogs/forgedcertdialog.h
index bc259d4..5386f14 100644
--- a/pica-client/dialogs/forgedcertdialog.h
+++ b/pica-client/dialogs/forgedcertdialog.h
@@ -9,7 +9,7 @@ class ForgedCertDialog : public QDialog
 {
     Q_OBJECT
 public:
-    explicit ForgedCertDialog(quint32 peer_id, QString received_cert, QString stored_cert, QWidget *parent = 0);
+    explicit ForgedCertDialog(QByteArray peer_id, QString received_cert, QString stored_cert, QWidget *parent = 0);
 
 private:
     QString received_cert_;