Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-14 08:59:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved pgp cleaning function

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-07-27 14:08:35 +00:00
parent da8a8ec659
commit a28786513e
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libretroshare/src/pqi/cleanupxpgp.cc
View File

@ -41,6 +41,10 @@ end tag we take care of cases like ----- END XPGP . Here extra empty spaces h
introduced and the actual tag should have been -----END XPGP introduced and the actual tag should have been -----END XPGP
*/ */
static bool is_acceptable_radix64Char(char c)
{
return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '+' || c == '/' ;
}
std::string cleanUpCertificate(const std::string& badCertificate,int& error_code) std::string cleanUpCertificate(const std::string& badCertificate,int& error_code)
{ {
@ -262,20 +266,24 @@ std::string cleanUpCertificate(const std::string& badCertificate,int& error_code
} }
if(badCertificate[currBadCertIdx]=='=') /* checksum */ if(badCertificate[currBadCertIdx]=='=') /* checksum */
{
cntPerLine=0 ;
break; break;
} else if(badCertificate[currBadCertIdx]=='\t')
currBadCertIdx++;
else if(badCertificate[currBadCertIdx]==' ') else if(badCertificate[currBadCertIdx]==' ')
currBadCertIdx++; currBadCertIdx++;
else if(badCertificate[currBadCertIdx]=='\n') else if(badCertificate[currBadCertIdx]=='\n')
currBadCertIdx++; currBadCertIdx++;
else else if(is_acceptable_radix64Char(badCertificate[currBadCertIdx]))
{ {
cleanCertificate += badCertificate[currBadCertIdx]; cleanCertificate += badCertificate[currBadCertIdx];
cntPerLine++; cntPerLine++;
currBadCertIdx++; currBadCertIdx++;
} }
else
{
std::cerr << "Warning: Invalid character in radix certificate encoding: " << badCertificate[currBadCertIdx] << std::endl;
currBadCertIdx++;
}
} }
if(currBadCertIdx>=endCertStartIdx1) if(currBadCertIdx>=endCertStartIdx1)
{ {