Author: mcalmer Date: Wed Oct 10 12:50:37 2007 New Revision: 41306 URL: http://svn.opensuse.org/viewcvs/yast?rev=41306&view=rev Log: version 2.13.33 Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/VERSION branches/SuSE-SLE-10-SP1-Branch/ca-management/package/yast2-ca-management.changes branches/SuSE-SLE-10-SP1-Branch/ca-management/src/YaPI/CaManagement.pm branches/SuSE-SLE-10-SP1-Branch/ca-management/src/ca_select_proposal.ycp branches/SuSE-SLE-10-SP1-Branch/ca-management/src/certificate.ycp branches/SuSE-SLE-10-SP1-Branch/ca-management/src/crlDefault.ycp branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert.ycp branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert_read_write.ycp branches/SuSE-SLE-10-SP1-Branch/ca-management/src/util.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/VERSION?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/VERSION Wed Oct 10 12:50:37 2007 @@ -1 +1 @@ -2.13.32 +2.13.33 Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/package/yast2-ca-management.changes?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/package/yast2-ca-management.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/package/yast2-ca-management.changes Wed Oct 10 12:50:37 2007 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Oct 10 12:39:02 CEST 2007 - mc@suse.de + +- version 2.13.33 +- fix logging [#332002] +- fix request generation [#326465] + +------------------------------------------------------------------- +Mon Jul 9 11:27:53 CEST 2007 - mc@suse.de + +- fix always disabled Export Button [#231434] + +------------------------------------------------------------------- Tue Apr 10 17:46:39 CEST 2007 - jdsn@suse.de - adjusted valid characters for CA properties (#256392) Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/YaPI/CaManagement.pm?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/YaPI/CaManagement.pm (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/YaPI/CaManagement.pm Wed Oct 10 12:50:37 2007 @@ -2565,18 +2565,7 @@ { if(lc($map->iterator_key($mapIT)) eq "status") { - if(lc($map->iterator_value($mapIT)) eq "valid") - { - $hash->{status} = __("Valid"); - } - elsif(lc($map->iterator_value($mapIT)) eq "revoked") - { - $hash->{status} = __("Revoked"); - } - else # expired - { - $hash->{status} = __("Expired"); - } + $hash->{status} = lc($map->iterator_value($mapIT)); } else { Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/ca_select_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/ca_select_proposal.ycp?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/ca_select_proposal.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/ca_select_proposal.ycp Wed Oct 10 12:50:37 2007 @@ -114,7 +114,7 @@ UI::ChangeWidget(`id(`id_organisationUnit), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_locality), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_state), `ValidChars, valid_chars); -y2milestone(valid_chars); + y2milestone("%1", valid_chars); UI::ChangeWidget(`id(`id_CAName), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"); // Get the user input. Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/certificate.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/certificate.ycp?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/certificate.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/certificate.ycp Wed Oct 10 12:50:37 2007 @@ -279,7 +279,19 @@ foreach (map element, ret, ``{ - result = add (result, `item (`id (i), element["status"]:"", + // Certificate status displayed in a table (Valid, Revoked, Expired) + string st = _("Valid"); + if(element["status"]:"" == "revoked") + { + // Certificate status displayed in a table (Valid, Revoked, Expired) + st = _("Revoked"); + } + if(element["status"]:"" == "expired") + { + // Certificate status displayed in a table (Valid, Revoked, Expired) + st = _("Expired"); + } + result = add (result, `item (`id (i), st, element["commonName"]:"", element["emailAddress"]:"", element["organizationName"]:"", @@ -380,7 +392,7 @@ UI::ChangeWidget( `id(`textinfo), `Value, getCertDescription (ret)); term table_item = (term) UI::QueryWidget(`id(`table), `Item(id)); - boolean valid = ((string) table_item[1]:"") == "Valid"; + boolean valid = ((string) table_item[1]:"") == _("Valid"); UI::ChangeWidget (`id (`delete), `Enabled, !valid); UI::ChangeWidget (`id (`revoke), `Enabled, valid); // do not export certificates which are a CA or revoked certificate Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/crlDefault.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/crlDefault.ycp?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/crlDefault.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/crlDefault.ycp Wed Oct 10 12:50:37 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: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert.ycp?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert.ycp Wed Oct 10 12:50:37 2007 @@ -160,7 +160,7 @@ UI::ChangeWidget(`id(`id_organisationUnit), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_locality), `ValidChars, valid_chars); UI::ChangeWidget(`id(`id_state), `ValidChars, valid_chars); -y2milestone(valid_chars); + y2milestone("%1", valid_chars); UI::ChangeWidget(`id(`id_CAName), `ValidChars, "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"); UI::SetFocus(`id(`id_CAName)); Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert_read_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert_read_write.ycp?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert_read_write.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/new_cert_read_write.ycp Wed Oct 10 12:50:37 2007 @@ -749,6 +749,7 @@ ||kind == "Sub CA Request") { param["caName"] = CaMgm::currentCA; + param["caPasswd"] = getPassword(CaMgm::currentCA); } if (kind == "Server Certificate") { @@ -1272,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; } } @@ -1293,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") @@ -1692,6 +1694,10 @@ } y2milestone("CaManagement::WriteCertificateDefaults(%1)", param); + + // now set the password + param["caPasswd"] = getPassword(CaMgm::currentCA); + return YaPI::CaManagement::WriteCertificateDefaults (param); } Modified: branches/SuSE-SLE-10-SP1-Branch/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ca-management/src/util.ycp?rev=41306&r1=41305&r2=41306&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ca-management/src/util.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ca-management/src/util.ycp Wed Oct 10 12:50:37 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