Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-19 21:04:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

suppressed bug when creating new certificate

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1032 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-02-10 09:33:30 +00:00
parent b94e6f6386
commit 08357e3bdd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/rsserver/p3face-startup.cc
View File

@ -1043,7 +1043,7 @@ bool RsInit::RsGenerateCertificate(
std::string org, std::string org,
std::string loc, std::string loc,
std::string country, std::string country,
std::string passwd, std::string password,
std::string &errString) std::string &errString)
{ {
// In the XPGP world this is easy... // In the XPGP world this is easy...
@ -1053,7 +1053,7 @@ bool RsInit::RsGenerateCertificate(
// then load as if they had entered a passwd. // then load as if they had entered a passwd.
// check password. // check password.
if (passwd.length() < 4) if (password.length() < 4)
{ {
errString = "Password is Unsatisfactory (must be 4+ chars)"; errString = "Password is Unsatisfactory (must be 4+ chars)";
return false; return false;
@ -1079,7 +1079,7 @@ bool RsInit::RsGenerateCertificate(
/**************** PQI_USE_XPGP ******************/ /**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP) #if defined(PQI_USE_XPGP)
if (!generate_xpgp(cert_name.c_str(), key_name.c_str(), if (!generate_xpgp(cert_name.c_str(), key_name.c_str(),
passwd.c_str(), password.c_str(),
name.c_str(), name.c_str(),
"", //ui -> gen_email -> value(), "", //ui -> gen_email -> value(),
org.c_str(), org.c_str(),
@ -1109,7 +1109,7 @@ bool RsInit::RsGenerateCertificate(
/* if we get here .... then save details to the configuration class */ /* if we get here .... then save details to the configuration class */
load_cert = cert_name; load_cert = cert_name;
load_key = key_name; load_key = key_name;
passwd = passwd; passwd = password;
havePasswd = true; havePasswd = true;
firsttime_run = true; firsttime_run = true;