spot-on-development Mailing List for Spot-On

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1314
          http://sourceforge.net/p/spot-on/code/1314
Author:   textfield
Date:     2013-06-17 14:12:23 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Do not retrieve the private key multiple times. Instead, store it in secure memory.
Log errors.
Comments.

Modified Paths:
--------------
    branches/0.x/Common/spot-on-gcrypt.cc
    branches/0.x/Common/spot-on-gcrypt.h
    branches/0.x/Kernel/spot-on-listener.h

Modified: branches/0.x/Common/spot-on-gcrypt.cc
===================================================================

--- branches/0.x/Common/spot-on-gcrypt.cc	2013-06-17 12:55:14 UTC (rev 1313)
+++ branches/0.x/Common/spot-on-gcrypt.cc	2013-06-17 14:12:23 UTC (rev 1314)
@@ -732,6 +732,7 @@
   m_iterationCount = 0; // We're not deriving keys.
   m_passphrase = 0;
   m_passphraseLength = 0;
+  m_privateKey = 0;
   m_symmetricKey = 0;
 
   if(m_cipherAlgorithm)
@@ -826,6 +827,7 @@
   m_iterationCount = iterationCount;
   m_passphrase = 0;
   m_passphraseLength = passphrase.length();
+  m_privateKey = 0;
   m_symmetricKey = 0;
 
   if(m_cipherAlgorithm)
@@ -924,6 +926,7 @@
 {
   gcry_cipher_close(m_cipherHandle);
   gcry_free(m_passphrase);
+  gcry_free(m_privateKey);
   gcry_free(m_symmetricKey);
 }
 
@@ -1511,58 +1514,79 @@
   gcry_sexp_t raw_t = 0;
   size_t length = 0;
 
-  {
-    QSqlDatabase db = QSqlDatabase::addDatabase("QSQLITE", "spoton_gcrypt");
+  if(!m_privateKey)
+    {
+      {
+	QSqlDatabase db = QSqlDatabase::addDatabase
+	  ("QSQLITE", "spoton_gcrypt");
 
-    db.setDatabaseName(spoton_misc::homePath() + QDir::separator() +
-		       "idiotes.db");
+	db.setDatabaseName(spoton_misc::homePath() + QDir::separator() +
+			   "idiotes.db");
 
-    if(db.open())
-      {
-	QSqlQuery query(db);
+	if(db.open())
+	  {
+	    QSqlQuery query(db);
 
-	query.setForwardOnly(true);
-	query.prepare("SELECT private_key FROM idiotes WHERE id = ?");
-	query.bindValue(0, m_id);
+	    query.setForwardOnly(true);
+	    query.prepare("SELECT private_key FROM idiotes WHERE id = ?");
+	    query.bindValue(0, m_id);
 
-	if(query.exec())
-	  if(query.next())
-	    keyData = QByteArray::fromBase64
-	      (query.value(0).toByteArray());
+	    if(query.exec())
+	      if(query.next())
+		keyData = QByteArray::fromBase64
+		  (query.value(0).toByteArray());
+	  }
+
+	db.close();
       }
 
-    db.close();
-  }
+      QSqlDatabase::removeDatabase("spoton_gcrypt");
 
-  QSqlDatabase::removeDatabase("spoton_gcrypt");
+      if(keyData.isEmpty())
+	{
+	  if(ok)
+	    *ok = false;
 
-  if(keyData.isEmpty())
-    {
-      if(ok)
-	*ok = false;
+	  spoton_misc::logError
+	    ("spoton_gcrypt::publicKeyDecrypt(): empty private key.");
+	  goto done_label;
+	}
 
-      spoton_misc::logError
-	("spoton_gcrypt::publicKeyDecrypt(): empty private key.");
-      goto done_label;
-    }
+      {
+	bool ok = true;
 
-  {
-    bool ok = true;
+	keyData = this->decrypted(keyData, &ok);
 
-    keyData = this->decrypted(keyData, &ok);
+	if(!ok)
+	  keyData.clear();
+      }
 
-    if(!ok)
-      keyData.clear();
-  }
+      if(keyData.isEmpty())
+	{
+	  if(ok)
+	    *ok = false;
 
-  if(keyData.isEmpty())
-    {
-      if(ok)
-	*ok = false;
+	  spoton_misc::logError
+	    ("spoton_gcrypt::publicKeyDecrypt(): decrypted() failure.");
+	  goto done_label;
+	}
 
-      spoton_misc::logError
-	("spoton_gcrypt::publicKeyDecrypt(): decrypted() failure.");
-      goto done_label;
+      m_privateKeyLength = keyData.length();
+
+      if((m_privateKey =
+	  static_cast<char *> (gcry_calloc_secure(m_privateKeyLength,
+						  sizeof(char)))) == 0)
+	{
+	  m_privateKeyLength = 0;
+	  spoton_misc::logError
+	    ("spoton_gcrypt::publicKeyDecrypt(): gcry_calloc_secure() "
+	     "failure.");
+	  goto done_label;
+	}
+      else
+	memcpy(static_cast<void *> (m_privateKey),
+	       static_cast<const void *> (keyData.constData()),
+	       m_privateKeyLength);
     }
 
   /*
@@ -1570,13 +1594,16 @@
   */
 
   if((err = gcry_sexp_new(&key_t,
-			  static_cast<const void *> (keyData.constData()),
-			  static_cast<size_t> (keyData.length()),
-			  1)) != 0 || !key_t)
+			  static_cast<const void *> (m_privateKey),
+			  m_privateKeyLength, 1)) != 0 || !key_t)
     {
       if(ok)
 	*ok = false;
 
+      gcry_free(m_privateKey);
+      m_privateKey = 0;
+      m_privateKeyLength = 0;
+
       if(err != 0)
 	spoton_misc::logError
 	  (QString("spoton_gcrypt::publicKeyDecrypt(): gcry_sexp_new() "
@@ -1588,17 +1615,10 @@
       goto done_label;
     }
 
-  if((err = gcry_pk_testkey(key_t)) != 0)
-    {
-      if(ok)
-	*ok = false;
+  /*
+  ** We once tested the private key via gcry_pk_testkey() here.
+  */
 
-      spoton_misc::logError
-	(QString("spoton_gcrypt::publicKeyDecrypt(): gcry_pk_testkey() "
-		 "failure (%1).").arg(gcry_strerror(err)));
-      goto done_label;
-    }
-
   if((err = gcry_sexp_new(&data_t,
 			  static_cast<const void *> (data.constData()),
 			  static_cast<size_t> (data.length()),

Modified: branches/0.x/Common/spot-on-gcrypt.h
===================================================================
--- branches/0.x/Common/spot-on-gcrypt.h	2013-06-17 12:55:14 UTC (rev 1313)
+++ branches/0.x/Common/spot-on-gcrypt.h	2013-06-17 14:12:23 UTC (rev 1314)
@@ -113,12 +113,14 @@
   QString m_hashType;
   QString m_id;
   char *m_passphrase;
+  char *m_privateKey;
   char *m_symmetricKey;
   gcry_cipher_hd_t m_cipherHandle;
   int m_cipherAlgorithm;
   int m_hashAlgorithm;
   int m_saltLength;
   size_t m_passphraseLength;
+  size_t m_privateKeyLength;
   size_t m_symmetricKeyLength;
   unsigned long m_iterationCount;
   static void init(void);

Modified: branches/0.x/Kernel/spot-on-listener.h
===================================================================
--- branches/0.x/Kernel/spot-on-listener.h	2013-06-17 12:55:14 UTC (rev 1313)
+++ branches/0.x/Kernel/spot-on-listener.h	2013-06-17 14:12:23 UTC (rev 1314)
@@ -35,6 +35,7 @@
 #include <QTimer>
 
 #include "Common/spot-on-external-address.h"
+#include "Common/spot-on-misc.h"
 #include "spot-on-neighbor.h"
 
 class QNetworkInterface;
@@ -63,6 +64,11 @@
   void incomingConnection(int socketDescriptor)
 #endif
   {
+    /*
+    ** We cannot use findChildren() because the neighbor object
+    ** may become a child of another object.
+    */
+
     if(m_neighbors >= maxPendingConnections())
       {
 	QTcpSocket socket;
@@ -91,7 +97,12 @@
  private slots:
   void slotNeighborDestroyed(void)
   {
-    m_neighbors -= 1;
+    if(m_neighbors > 0)
+      m_neighbors -= 1;
+    else
+      spoton_misc::logError
+	("spoton_listener_tcp_server::slotNeighborDestroyed(): m_neighbors "
+	 "equals zero. Cannot decrement. Internal problem. Please report.");
   }
 };
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





spot-on-development Mailing List for Spot-On

spot-on-development — Spot-On Development