From ddf503a7932155bfc32265b51af47d750b15976d Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Fri, 13 Jul 2012 11:08:13 +0000
Subject: [PATCH] - moved pgpkey.h/cc into pgp directory - fixed bug in key
 cleaning code

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/libretroshare.pro                 |  4 ++--
 libretroshare/src/pgp/pgphandler.cc                 |  3 +--
 .../src/{util/pgpkey.cc => pgp/pgpkeyutil.cc}       |  2 +-
 .../src/{util/pgpkey.h => pgp/pgpkeyutil.h}         |  0
 libretroshare/src/pqi/authgpg.cc                    |  2 +-
 libretroshare/src/pqi/cleanupxpgp.cc                | 13 ++++++++++++-
 libretroshare/src/retroshare/rspeers.h              |  1 +
 7 files changed, 18 insertions(+), 7 deletions(-)
 rename libretroshare/src/{util/pgpkey.cc => pgp/pgpkeyutil.cc} (99%)
 rename libretroshare/src/{util/pgpkey.h => pgp/pgpkeyutil.h} (100%)

diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 8957e17e4..184ca3dce 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -378,6 +378,7 @@ HEADERS +=	ft/ftchunkmap.h \
 HEADERS +=	pqi/authssl.h \
 			pqi/authgpg.h \
 			pgp/pgphandler.h \
+			pgp/pgpkeyutil.h \
 			pqi/cleanupxpgp.h \
 			pqi/p3cfgmgr.h \
 			pqi/p3peermgr.h \
@@ -493,7 +494,6 @@ HEADERS +=	util/folderiterator.h \
 			util/rsrandom.h \
 			util/pugiconfig.h \
 			util/radix64.h \
-			util/pgpkey.h \
 			util/pugixml.h
 
 SOURCES +=	dbase/cachestrapper.cc \
@@ -518,6 +518,7 @@ SOURCES +=	ft/ftchunkmap.cc \
 SOURCES +=	pqi/authgpg.cc \
 			pqi/authssl.cc \
 			pgp/pgphandler.cc \
+			pgp/pgpkeyutil.cc \
 			pqi/cleanupxpgp.cc \
 			pqi/p3cfgmgr.cc \
 			pqi/p3peermgr.cc \
@@ -634,7 +635,6 @@ SOURCES +=	util/folderiterator.cc \
 			util/rsversion.cc \
 			util/rswin.cc \
 			util/rsrandom.cc \
-			util/pgpkey.cc \
 			util/pugixml.cc
 
 minimal {
diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc
index b6b1dab05..de0526a77 100644
--- a/libretroshare/src/pgp/pgphandler.cc
+++ b/libretroshare/src/pgp/pgphandler.cc
@@ -22,7 +22,7 @@ extern "C" {
 #include "pgphandler.h"
 #include "retroshare/rsiface.h"		// For rsicontrol.
 #include "util/rsdir.h"		
-#include "util/pgpkey.h"
+#include "pgp/pgpkeyutil.h"
 
 //#define DEBUG_PGPHANDLER 1
 
@@ -434,7 +434,6 @@ std::string PGPHandler::makeRadixEncodedPGPKey(const ops_keydata_t *key)
 
 	ops_memory_t *buf = NULL ;
    ops_setup_memory_write(&cinfo, &buf, 0);
-	const unsigned char *passphrase = NULL ;
 
 	if(key->type == OPS_PTAG_CT_PUBLIC_KEY)
 	{
diff --git a/libretroshare/src/util/pgpkey.cc b/libretroshare/src/pgp/pgpkeyutil.cc
similarity index 99%
rename from libretroshare/src/util/pgpkey.cc
rename to libretroshare/src/pgp/pgpkeyutil.cc
index 27e81d93a..42b088aa4 100644
--- a/libretroshare/src/util/pgpkey.cc
+++ b/libretroshare/src/pgp/pgpkeyutil.cc
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <util/radix64.h>
-#include "pgpkey.h"
+#include "pgpkeyutil.h"
 
 #include <iostream>
 #include <stdexcept>
diff --git a/libretroshare/src/util/pgpkey.h b/libretroshare/src/pgp/pgpkeyutil.h
similarity index 100%
rename from libretroshare/src/util/pgpkey.h
rename to libretroshare/src/pgp/pgpkeyutil.h
diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc
index 653e1105c..89930154e 100644
--- a/libretroshare/src/pqi/authgpg.cc
+++ b/libretroshare/src/pqi/authgpg.cc
@@ -34,7 +34,7 @@
 #include "pgp/pgphandler.h"
 
 #include <util/rsdir.h>
-#include <util/pgpkey.h>
+#include <pgp/pgpkeyutil.h>
 #include <iostream>
 #include <stdexcept>
 #include <sstream>
diff --git a/libretroshare/src/pqi/cleanupxpgp.cc b/libretroshare/src/pqi/cleanupxpgp.cc
index c2ed8858c..16298eee3 100644
--- a/libretroshare/src/pqi/cleanupxpgp.cc
+++ b/libretroshare/src/pqi/cleanupxpgp.cc
@@ -287,7 +287,18 @@ std::string cleanUpCertificate(const std::string& badCertificate,int& error_code
 	while(currBadCertIdx < endCertStartIdx1 && (badCertificate[currBadCertIdx] == '=' || badCertificate[currBadCertIdx] == ' ' || badCertificate[currBadCertIdx] == '\n' ))
 		currBadCertIdx++ ;
 
-	cleanCertificate += "==\n=";
+	switch(cntPerLine % 4)
+	{
+		case 0: break ;
+		case 1: std::cerr<<"Certificate corrupted beyond repair: wrongnumber of chars on last line (n%4=1)"<<std::endl;		
+				  error_code = RS_PEER_CERT_CLEANING_CODE_WRONG_NUMBER;
+				  return badCertificate ;
+		case 2: cleanCertificate += "==" ;
+				  break ;
+		case 3: cleanCertificate += "=" ;
+				  break ;
+	}
+	cleanCertificate += "\n=";
 
 //	if (badCertificate[currBadCertIdx] == '=')
 //	{
diff --git a/libretroshare/src/retroshare/rspeers.h b/libretroshare/src/retroshare/rspeers.h
index c8acf54ef..c288fc037 100644
--- a/libretroshare/src/retroshare/rspeers.h
+++ b/libretroshare/src/retroshare/rspeers.h
@@ -78,6 +78,7 @@ const int RS_PEER_CERT_CLEANING_CODE_UNKOWN_ERROR  = 0x01 ;
 const int RS_PEER_CERT_CLEANING_CODE_NO_BEGIN_TAG  = 0x02 ;
 const int RS_PEER_CERT_CLEANING_CODE_NO_END_TAG    = 0x03 ;
 const int RS_PEER_CERT_CLEANING_CODE_NO_CHECKSUM   = 0x04 ;
+const int RS_PEER_CERT_CLEANING_CODE_WRONG_NUMBER  = 0x05 ;
 
 /* LinkType Flags */