Author: mcalmer Date: Wed Oct 10 11:39:15 2007 New Revision: 41303 URL: http://svn.opensuse.org/viewcvs/yast?rev=41303&view=rev Log: do not log passwords Modified: trunk/ca-management/src/crlDefault.ycp trunk/ca-management/src/new_cert_read_write.ycp trunk/ca-management/src/util.ycp Modified: trunk/ca-management/src/crlDefault.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/crlDefault.ycp?rev=41303&r1=41302&r2=41303&view=diff ============================================================================== --- trunk/ca-management/src/crlDefault.ycp (original) +++ trunk/ca-management/src/crlDefault.ycp Wed Oct 10 11:39:15 2007 @@ -252,6 +252,10 @@ param["caPasswd"] = getPassword(ca); boolean writeret = (boolean) YaPI::CaManagement::WriteCRLDefaults (param); + + // we do not want to log the password + param["caPasswd"] = "<was set>"; + y2milestone ("WriteCRLDefaults(%1) return %2", param, writeret); if (writeret == nil Modified: trunk/ca-management/src/new_cert_read_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/new_cert_read_write.ycp?rev=41303&r1=41302&r2=41303&view=diff ============================================================================== --- trunk/ca-management/src/new_cert_read_write.ycp (original) +++ trunk/ca-management/src/new_cert_read_write.ycp Wed Oct 10 11:39:15 2007 @@ -1273,7 +1273,7 @@ || kind == "Client Request" || kind == "Sub CA Request") { - y2milestone("CaManagement::AddRequest(%1)", param); +// y2milestone("CaManagement::AddRequest(%1)", param); return YaPI::CaManagement::AddRequest (param) == nil ? false:true; } } @@ -1294,7 +1294,8 @@ // fillup parameters depending on kind param["caName"] = CaMgm::currentCA; - param["caPasswd"] = getPassword(CaMgm::currentCA); + // set the real password later. + param["caPasswd"] = "<was set>"; param["certType"] = kindmap[CaMgm::currentDefault]:""; if (CaMgm::adv_ca != "none") @@ -1693,6 +1694,10 @@ } y2milestone("CaManagement::WriteCertificateDefaults(%1)", param); + + // now set the password + param["caPasswd"] = getPassword(CaMgm::currentCA); + return YaPI::CaManagement::WriteCertificateDefaults (param); } Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=41303&r1=41302&r2=41303&view=diff ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Wed Oct 10 11:39:15 2007 @@ -1129,19 +1129,19 @@ string filename = (string) SCR::Read (.target.tmpdir) + "/commonCertificate"; string ret = (string) YaPI::CaManagement::ExportCertificate ($["caName": CAname, - "caPasswd" : getPassword (CAname), - "certificate" : certificate, - "keyPasswd" : password, - "exportFormat" : "PKCS12_CHAIN", - "destinationFile" : filename, - "P12Password" : password - ]); + "caPasswd" : getPassword (CAname), + "certificate" : certificate, + "keyPasswd" : password, + "exportFormat" : "PKCS12_CHAIN", + "destinationFile" : filename, + "P12Password" : password + ]); y2milestone ("ExportCertificate(%1) return %2", $["caName": CAname, - "certificate" : certificate, - "destinationFile" : filename, - "P12Password" : password - ], ret); + "certificate" : certificate, + "exportFormat" : "PKCS12_CHAIN", + "destinationFile" : filename + ], ret); if (ret == nil || ret != "1") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org