Hello community,
here is the log from the commit of package yast2-ca-management for
openSUSE:Factory
checked in at Sun Oct 2 11:18:55 CEST 2011.
--------
--- openSUSE:Factory/yast2-ca-management/yast2-ca-management.changes
2011-09-23 12:53:06.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-ca-management/yast2-ca-management.changes
2011-09-29 12:28:04.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Sep 29 11:01:16 CEST 2011 - [email protected]
+
+- version 2.21.8
+- quote pathes used in target.bash (bnc#266220)
+- implement export request (bnc#717224)
+
+-------------------------------------------------------------------
+Mon Sep 26 14:44:47 CEST 2011 - [email protected]
+
+- version 2.21.7
+- fix dependency
+
+-------------------------------------------------------------------
+Mon Sep 26 14:01:30 CEST 2011 - [email protected]
+
+- version 2.21.6
+- set dialog title, fix dialog icon name
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ca-management-2.21.5.tar.bz2
New:
----
yast2-ca-management-2.21.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ca-management.spec ++++++
--- /var/tmp/diff_new_pack.Gd8j8x/_old 2011-10-02 11:18:48.000000000 +0200
+++ /var/tmp/diff_new_pack.Gd8j8x/_new 2011-10-02 11:18:48.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-ca-management
-Version: 2.21.5
+Version: 2.21.8
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ca-management-2.21.5.tar.bz2
+Source0: yast2-ca-management-2.21.8.tar.bz2
Prefix: /usr
@@ -32,6 +32,7 @@
BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt
limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN
perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools
Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN
perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI
Requires: limal-ca-mgm-perl >= 1.4.0
+Requires: yast2 >= 2.21.22
BuildArch: noarch
Summary: YaST2 - CAs, Certificates and Requests Management
@@ -39,7 +40,7 @@
Managing CAs, Certificates and Requests in an understanding way.
%prep
-%setup -n yast2-ca-management-2.21.5
+%setup -n yast2-ca-management-2.21.8
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-ca-management-2.21.5.tar.bz2 -> yast2-ca-management-2.21.8.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/VERSION
new/yast2-ca-management-2.21.8/VERSION
--- old/yast2-ca-management-2.21.5/VERSION 2011-09-19 13:42:38.000000000
+0200
+++ new/yast2-ca-management-2.21.8/VERSION 2011-09-29 12:25:11.000000000
+0200
@@ -1 +1 @@
-2.21.5
+2.21.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/configure
new/yast2-ca-management-2.21.8/configure
--- old/yast2-ca-management-2.21.5/configure 2011-09-19 13:43:45.000000000
+0200
+++ new/yast2-ca-management-2.21.8/configure 2011-09-29 12:25:19.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-ca-management 2.21.5.
+# Generated by GNU Autoconf 2.68 for yast2-ca-management 2.21.8.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ca-management'
PACKAGE_TARNAME='yast2-ca-management'
-PACKAGE_VERSION='2.21.5'
-PACKAGE_STRING='yast2-ca-management 2.21.5'
+PACKAGE_VERSION='2.21.8'
+PACKAGE_STRING='yast2-ca-management 2.21.8'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-ca-management 2.21.5 to adapt to many kinds of
systems.
+\`configure' configures yast2-ca-management 2.21.8 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1301,7 +1301,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ca-management 2.21.5:";;
+ short | recursive ) echo "Configuration of yast2-ca-management 2.21.8:";;
esac
cat <<\_ACEOF
@@ -1381,7 +1381,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ca-management configure 2.21.5
+yast2-ca-management configure 2.21.8
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1398,7 +1398,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-ca-management $as_me 2.21.5, which was
+It was created by yast2-ca-management $as_me 2.21.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2328,7 +2328,7 @@
# Define the identity of the package.
PACKAGE='yast2-ca-management'
- VERSION='2.21.5'
+ VERSION='2.21.8'
cat >>confdefs.h <<_ACEOF
@@ -2450,7 +2450,7 @@
-VERSION="2.21.5"
+VERSION="2.21.8"
RPMNAME="yast2-ca-management"
MAINTAINER="Michael Calmer <[email protected]>, J. Daniel Schmidt <[email protected]>"
@@ -3380,7 +3380,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ca-management $as_me 2.21.5, which was
+This file was extended by yast2-ca-management $as_me 2.21.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3433,7 +3433,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-ca-management config.status 2.21.5
+yast2-ca-management config.status 2.21.8
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/configure.in
new/yast2-ca-management-2.21.8/configure.in
--- old/yast2-ca-management-2.21.5/configure.in 2011-09-19 13:43:42.000000000
+0200
+++ new/yast2-ca-management-2.21.8/configure.in 2011-09-29 12:25:17.000000000
+0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ca-management, 2.21.5, http://bugs.opensuse.org/,
yast2-ca-management)
+AC_INIT(yast2-ca-management, 2.21.8, http://bugs.opensuse.org/,
yast2-ca-management)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.5"
+VERSION="2.21.8"
RPMNAME="yast2-ca-management"
MAINTAINER="Michael Calmer <[email protected]>, J. Daniel Schmidt <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/YaPI/CaManagement.pm
new/yast2-ca-management-2.21.8/src/YaPI/CaManagement.pm
--- old/yast2-ca-management-2.21.5/src/YaPI/CaManagement.pm 2010-01-14
18:21:54.000000000 +0100
+++ new/yast2-ca-management-2.21.8/src/YaPI/CaManagement.pm 2011-09-29
12:25:52.000000000 +0200
@@ -1,7 +1,7 @@
###############################################################
# Copyright 2004,2005 Novell, Inc. All rights reserved.
#
-# $Id: CaManagement.pm 60385 2010-01-14 17:21:53Z mcalmer $
+# $Id: CaManagement.pm 66150 2011-09-29 10:25:50Z mcalmer $
###############################################################
package YaPI::CaManagement;
@@ -123,6 +123,10 @@
Export a CRL to a file or returns it in different formats
+$bool = ExportRequest($valueMap)
+
+ Export a Request to a file
+
$bool = Verify($valueMap)
verify a certificate
@@ -417,6 +421,7 @@
use URI::Escape;
use X500::DN;
use MIME::Base64;
+use File::Copy;
#use Digest::MD5 qw(md5_hex);
#use Date::Calc qw( Date_to_Time Add_Delta_DHMS Today_and_Now);
@@ -3514,6 +3519,109 @@
}
=item *
+C<$bool = ExportRequest($valueMap)>
+
+Export a request to a file
+
+In I<$valueMap> you can define the following keys:
+
+* caName (required)
+
+* caPassword (required)
+
+* request (required)
+
+* destinationFile (required)
+
+The function return true on success.
+
+=cut
+BEGIN { $TYPEINFO{ExportRequest} = ["function", "any", ["map", "string",
"any"]]; }
+sub ExportRequest {
+ my $self = shift;
+ my $data = shift;
+ my $caName = "";
+ my $request = "";
+ my $destinationFile = undef;
+
+ # checking requires
+ if (!defined $data->{'caName'}) {
+ # parameter check failed
+ return $self->SetError(summary => __("Invalid value for parameter
'caName'."),
+ code => "PARAM_CHECK_FAILED");
+ }
+ $caName = $data->{"caName"};
+
+ if (!defined $data->{'caPasswd'}) {
+ # parameter check failed
+ return $self->SetError(summary => __("Invalid value for parameter
'caPasswd'."),
+ code => "PARAM_CHECK_FAILED");
+ }
+
+ if (! defined $data->{'request'}) {
+ # parameter check failed
+ return $self->SetError(summary => __("Invalid value for parameter
'request'."),
+ code => "PARAM_CHECK_FAILED");
+ }
+ $request = $data->{"request"};
+
+ if (! defined $data->{'destinationFile'}) {
+ return $self->SetError(summary => sprintf(__("Cannot parse
destinationFile %s."),
+ $data->{'destinationFile'}),
+ description => "Please enter an absolute path
and no special characters as filename.",
+ code => "PARAM_CHECK_FAILED");
+ }
+ $data->{'destinationFile'} =~ /^(\/.+\/)[A-Za-z0-9-_.]+$/;
+ if (not defined $1) {
+ # parameter check failed
+ return $self->SetError(summary => sprintf(__("Cannot parse
destinationFile %s."),
+ $data->{'destinationFile'}),
+ description => "Please enter an absolute path
and no special characters as filename.",
+ code => "PARAM_CHECK_FAILED");
+ }
+ my $ret = SCR->Read(".target.dir", ["$1", undef] );
+ if (not defined $ret) {
+ return $self->SetError(summary => __("Directory does not exist."),
+ description => "'$1' does not exist.",
+ code => "DIR_DOES_NOT_EXIST");
+ }
+ $destinationFile = $data->{'destinationFile'};
+
+ my $ca = undef;
+ eval {
+
+ if( defined $data->{'repository'}) {
+
+ $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'},
+ $data->{"repository"});
+ } else {
+
+ $ca = new LIMAL::CaMgm::CA($data->{"caName"}, $data->{'caPasswd'});
+
+ }
+ };
+ if($@) {
+
+ return $self->SetError( summary => __("Initializing the CA failed."),
+ description =>
YaST::caUtils->exception2String($@),
+ code => "LIMAL_CALL_FAILED");
+ }
+
+ my $repository = "$CAM_ROOT";
+ $repository = $data->{'repository'} if defined $data->{'repository'};
+
+ my $origPath = "$repository/$caName/req/$request.req";
+ my $size = SCR->Read(".target.size", $origPath);
+ if ($size <= 0) {
+ return $self->SetError(summary => __("Request not found in")."
'$origPath'",
+ code => "FILE_DOES_NOT_EXIST");
+ }
+ copy($origPath, $destinationFile) or return $self->SetError(summary =>
__("Copy Request failed"),
+ code =>
"LIMAL_CALL_FAILED");
+ return 1;
+}
+
+=item *
C<$file = ExportCertificate($valueMap)>
Export a certificate to a file or returns it in different formats.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/ca.ycp
new/yast2-ca-management-2.21.8/src/ca.ycp
--- old/yast2-ca-management-2.21.5/src/ca.ycp 2008-07-02 17:48:43.000000000
+0200
+++ new/yast2-ca-management-2.21.8/src/ca.ycp 2011-09-29 10:53:30.000000000
+0200
@@ -12,7 +12,7 @@
* Authors:
* Stefan Schubert <[email protected]>
*
- * $Id: ca.ycp 48787 2008-07-02 15:48:42Z mcalmer $
+ * $Id: ca.ycp 66042 2011-09-26 12:02:44Z visnov $
*
* Overview ( main window ) of a selected CA
*
@@ -71,7 +71,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
@@ -92,7 +92,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, defaultSequence);
UI::CloseDialog();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/ca_mgm_auto.ycp
new/yast2-ca-management-2.21.8/src/ca_mgm_auto.ycp
--- old/yast2-ca-management-2.21.5/src/ca_mgm_auto.ycp 2011-09-19
13:42:20.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/ca_mgm_auto.ycp 2011-09-29
11:03:03.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Ryan Partridge <[email protected]>
*
- * $Id: ca_mgm_auto.ycp 64401 2011-06-16 10:41:27Z jreidinger $
+ * $Id: ca_mgm_auto.ycp 66136 2011-09-29 09:03:02Z mcalmer $
*
* This is a client for autoinstallation. It takes its arguments,
* goes through the configuration and return the setting.
@@ -48,13 +48,13 @@
list<string> name_list = maplist ( string k, string v,
country_map, { return v; });
- name_list = sort (name_list);
-
+ name_list = sort (name_list);
+
foreach (string name, name_list, ``{
result = add (result, `item (`id (country_index[name]:""), name ,
CaMgm::autoYaSTSettings["country"]:Timezone::GetCountryForTimezone("") ==
country_index[name]:"") );
});
- return result;
+ return result;
}
@@ -73,7 +73,7 @@
Here, change the settings of this CA and certificate or import a CA and
certificate from a file.
</p>
");
-
+
/* Initialization dialog contents */
Wizard::CreateDialog();
@@ -86,7 +86,7 @@
_("Import Common CA
and Certificate"),
CaMgm::autoYaSTSettings["importCertificate"]:true)),
`HBox ( `HSpacing (3),
- `VBox(
+ `VBox(
`HBox (
`HWeight(2,
`TextEntry( `id (`pathCert), _("&Path of Certificate"),
CaMgm::autoYaSTSettings["pathCertificate"]:"")),
@@ -97,42 +97,42 @@
)
),
`HBox(`HWeight
(1,`Password(`id(`pw3), `opt(`hstretch), _("&Password:"),
CaMgm::autoYaSTSettings["password"]:"")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight
(1,`Password(`id(`pw4), `opt(`hstretch), _("Co&nfirm Password"),
confirmPassword))
)
)
- ),
+ ),
`Left(`RadioButton(`id(`notImport), `opt(
`notify),
_("Generate Common CA
and Certificate"),
!(CaMgm::autoYaSTSettings["importCertificate"]:false))),
`HBox(`HSpacing (3),
- `VBox(
+ `VBox(
`HBox(`HWeight (1,`TextEntry(
`id (`id_CAName), _("&CA Name:"),
CaMgm::autoYaSTSettings["CAName"]:"YaST_Default_CA")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight (1,`TextEntry(
`id (`id_commonName), _("&Common Name:"),
CaMgm::autoYaSTSettings["ca_commonName"]:""))
),
`HBox(`HWeight
(1,`TextEntry(`id(`email), _("E-Mail"),
CaMgm::autoYaSTSettings["server_email"]:"")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight (1,`ComboBox(
`id (`id_country), `opt(`editable), _("C&ountry:"),
getAutoCountryList()))
- ),
+ ),
`HBox(`HWeight (1,`TextEntry(
`id (`id_organisation), _("O&rganization:"),
CaMgm::autoYaSTSettings["organisation"]:"")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight (1,`TextEntry(
`id (`id_organisationUnit), _("Or&ganizational Unit:"),
CaMgm::autoYaSTSettings["organisationUnit"]:""))
),
`HBox(`HWeight (1,`TextEntry(
`id (`id_locality), _("Loca&lity:"),
CaMgm::autoYaSTSettings["locality"]:"")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight (1,`TextEntry(
`id (`id_state), _("&State:"),
CaMgm::autoYaSTSettings["state"]:""))
),
`HBox(`HWeight
(1,`Password(`id(`pw1), `opt(`hstretch), _("&Password:"),
CaMgm::autoYaSTSettings["password"]:"")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight
(1,`Password(`id(`pw2), `opt(`hstretch), _("Co&nfirm Password"),
confirmPassword))
),
`Left(`CheckBox(`id(`localServerName), `opt(`notify),
@@ -140,7 +140,7 @@
CaMgm::autoYaSTSettings["takeLocalServerName"]:true)),
`HBox(`HWeight (1,`TextEntry(
`id (`id_serverName), _("&Server Name:"),
CaMgm::autoYaSTSettings["server_commonName"]:"")),
- `HSpacing(2),
+ `HSpacing(2),
`HWeight (1,`Empty())
)
)
@@ -148,15 +148,15 @@
)
)
);
-
+
Wizard::SetContents (caption, contents, help_text, false, true);
Wizard::SetNextButton(`next, Label::FinishButton() );
-
+
// Get the user input.
//
any ret = nil;
- repeat
+ repeat
{
if (UI::QueryWidget(`id(`rb), `CurrentButton) == `import)
{
@@ -172,11 +172,11 @@
UI::ChangeWidget (`id (`pw2), `Enabled, false);
UI::ChangeWidget (`id (`localServerName), `Enabled, false);
UI::ChangeWidget (`id (`id_serverName), `Enabled, false);
- UI::ChangeWidget (`id (`pathCert), `Enabled, true);
+ UI::ChangeWidget (`id (`pathCert), `Enabled, true);
UI::ChangeWidget (`id(`browseCert), `Enabled, true);
UI::ChangeWidget (`id (`pw3), `Enabled, true);
UI::ChangeWidget (`id (`pw4), `Enabled, true);
-
+
}
else
{
@@ -189,11 +189,11 @@
UI::ChangeWidget (`id (`id_locality), `Enabled, true);
UI::ChangeWidget (`id (`id_state), `Enabled, true);
UI::ChangeWidget (`id (`localServerName), `Enabled, true);
- UI::ChangeWidget (`id (`pathCert), `Enabled, false);
+ UI::ChangeWidget (`id (`pathCert), `Enabled, false);
UI::ChangeWidget (`id(`browseCert), `Enabled, false);
UI::ChangeWidget (`id (`pw3), `Enabled, false);
UI::ChangeWidget (`id (`pw4), `Enabled, false);
-
+
UI::ChangeWidget (`id (`pw1), `Enabled, true);
UI::ChangeWidget (`id (`pw2), `Enabled, true);
@@ -204,10 +204,10 @@
else
{
UI::ChangeWidget (`id (`id_serverName), `Enabled, true);
- }
+ }
}
-
+
ret = Wizard::UserInput();
if (ret == `browseCert)
@@ -217,14 +217,14 @@
{
UI::ChangeWidget(`id(`pathCert), `Value, name);
}
- ret = `again;
+ ret = `again;
}
if (ret == `next
||ret == `back)
{
remove (CaMgm::autoYaSTSettings, "certificate");
-
+
boolean notImport = (boolean) (UI::QueryWidget(`id(`rb),
`CurrentButton) == `notImport);
if (notImport)
{
@@ -246,7 +246,7 @@
{
Popup::Error(_("CA name required."));
ret = `again;
- }
+ }
if (notImport
&& size ((string) UI::QueryWidget(`id(`id_commonName), `Value))
<= 0
&& ret!=`again)
@@ -268,7 +268,7 @@
&& ret!=`again)
{
Popup::Error(_("Server name required."));
- ret = `again;
+ ret = `again;
}
if (!notImport
@@ -284,42 +284,42 @@
{
Popup::Error(_("Password length should be greater than
three characters."));
ret = `again;
- }
- }
+ }
+ }
map retmap = $[];
-
+
if (!notImport
&& ret!=`again)
{
string command = sformat("/usr/bin/openssl base64 -in %1 -e",
- (string) UI::QueryWidget(`id
(`pathCert), `Value));
+ String::Quote ( (string)
UI::QueryWidget(`id (`pathCert), `Value)));
retmap = (map) SCR::Execute (.target.bash_output,
command,
$[] );
y2milestone("%1 :%2", command, retmap);
if (retmap["exit"]:0 != 0)
{
- y2error("%1 :%2", command, retmap);
+ y2error("%1 :%2", command, retmap);
Popup::Error(_("Cannot read the certificate."));
- ret = `again;
+ ret = `again;
}
}
if (ret!=`again)
{
CaMgm::autoYaSTSettings = $[];
-
+
CaMgm::autoYaSTSettings["importCertificate"] = (boolean)
((symbol)UI::QueryWidget(`id(`rb), `CurrentButton) == `import);
if (CaMgm::autoYaSTSettings["importCertificate"]:false)
{
CaMgm::autoYaSTSettings["certificate"] =
strip(retmap["stdout"]:"");
CaMgm::autoYaSTSettings["pathCertificate"] = (string)
UI::QueryWidget(`id (`pathCert), `Value);
- CaMgm::autoYaSTSettings["password"] = (string)
UI::QueryWidget(`id(`pw3), `Value);
+ CaMgm::autoYaSTSettings["password"] = (string)
UI::QueryWidget(`id(`pw3), `Value);
}
else
{
- CaMgm::autoYaSTSettings["takeLocalServerName"] = (boolean)
UI::QueryWidget(`id(`localServerName), `Value);
+ CaMgm::autoYaSTSettings["takeLocalServerName"] = (boolean)
UI::QueryWidget(`id(`localServerName), `Value);
CaMgm::autoYaSTSettings["password"] = (string)
UI::QueryWidget(`id(`pw1), `Value);
if (!CaMgm::autoYaSTSettings["takeLocalServerName"]:true)
{
@@ -363,7 +363,7 @@
// importing CA/certificate
CaMgm::autoYaSTSettings["certificate"] = settings["certificate"]:"";
CaMgm::autoYaSTSettings["pathCertificate"] =
settings["pathCertificate"]:"";
- CaMgm::autoYaSTSettings["password"] = settings["password"]:"";
+ CaMgm::autoYaSTSettings["password"] = settings["password"]:"";
}
else
{
@@ -372,20 +372,20 @@
{
CaMgm::autoYaSTSettings["password"] = settings["password"]:"";
}
-
+
CaMgm::autoYaSTSettings["takeLocalServerName"] =
settings["takeLocalServerName"]:true;
if (settings["takeLocalServerName"]:true )
{
map<string,string> host_ips = getHostIPs ();
string hostname_bak = "";
-
+
foreach(string key, string value, host_ips, {
if(value == "DNS")
{
hostname_bak = key;
}
});
-
+
map retmap = (map) SCR::Execute (.target.bash_output,
"/bin/hostname --long",
$[] );
@@ -406,44 +406,44 @@
else
{
if (haskey (settings, "server_commonName"))
- {
+ {
CaMgm::autoYaSTSettings["server_commonName"] =
settings["server_commonName"]:"";
}
}
if (haskey (settings, "CAName"))
- {
+ {
CaMgm::autoYaSTSettings["CAName"] =
settings["CAName"]:"YaST_Default_CA";
}
if (haskey (settings, "ca_commonName"))
- {
+ {
CaMgm::autoYaSTSettings["ca_commonName"] =
settings["ca_commonName"]:"";
}
if (haskey (settings, "server_email"))
- {
+ {
CaMgm::autoYaSTSettings["server_email"] =
settings["server_email"]:"";
}
if (haskey (settings, "country"))
- {
+ {
CaMgm::autoYaSTSettings["country"] = settings["country"]:"";
}
if (haskey (settings, "organisation"))
- {
+ {
CaMgm::autoYaSTSettings["organisation"] =
settings["organisation"]:"";
}
if (haskey (settings, "organisationUnit"))
- {
+ {
CaMgm::autoYaSTSettings["organisationUnit"] =
settings["organisationUnit"]:"";
}
if (haskey (settings, "locality"))
- {
+ {
CaMgm::autoYaSTSettings["locality"] = settings["locality"]:"";
}
if (haskey (settings, "state"))
- {
+ {
CaMgm::autoYaSTSettings["state"] = settings["state"]:"";
}
}
-
+
return ret;
}
@@ -453,7 +453,7 @@
* @return map Dumped settings (later acceptable by Import ())
*/
map Export () {
-
+
return CaMgm::autoYaSTSettings;
}
@@ -477,7 +477,7 @@
if (CaMgm::autoYaSTSettings["importCertificate"]:false)
{
- summary = Summary::AddHeader (summary,_("Import Certificate from
File"));
+ summary = Summary::AddHeader (summary,_("Import Certificate from
File"));
summary = Summary::AddLine (summary,
CaMgm::autoYaSTSettings["pathCertificate"]:"");
}
else
@@ -507,7 +507,7 @@
summary = Summary::AddLine (summary,
CaMgm::autoYaSTSettings["locality"]:_("[not set]"));
summary = Summary::AddHeader (summary, _("State"));
summary = Summary::AddLine (summary,
CaMgm::autoYaSTSettings["state"]:_("[not set]"));
-
+
summary = Summary::AddHeader (summary, _("Password"));
if (size (CaMgm::autoYaSTSettings["password"]:"") <= 0 )
{
@@ -518,7 +518,7 @@
summary = Summary::AddLine (summary, _("[set]"));
}
}
-
+
return summary;
}
@@ -535,7 +535,7 @@
Report::DisplayErrors(true, 5);
Report::DisplayMessages(true, 5);
-
+
// We do not set help text here, because it was set outside
Progress::New(caption, " ", steps, [
/* Progress stage 1/2 */
@@ -556,13 +556,13 @@
// Read server information
string tmpfile = (string) SCR::Read (.target.tmpdir) +
"/YaST-Servercert.p12";
-
+
Progress::NextStage();
if (CaMgm::autoYaSTSettings["importCertificate"]:false)
{
// importing CA/certificate
string command = sformat("/usr/bin/openssl base64 -out %1 -d",
- tmpfile);
+ String::Quote ( tmpfile ));
SCR::Execute (.target.bash_input,
command,
CaMgm::autoYaSTSettings["certificate"]:"");
@@ -574,14 +574,14 @@
{
map<string,string> host_ips = getHostIPs ();
string hostname_bak = "";
-
+
foreach(string key, string value, host_ips, {
if(value == "DNS")
{
hostname_bak = key;
}
});
-
+
map retmap = (map) SCR::Execute (.target.bash_output,
"/bin/hostname --long",
$[] );
@@ -604,7 +604,7 @@
{
CaMgm::prop_server_commonName =
CaMgm::autoYaSTSettings["server_commonName"]:"";
}
-
+
CaMgm::prop_selection = `def;
CaMgm::prop_ca_commonName = CaMgm::autoYaSTSettings["ca_commonName"]:"";
CaMgm::prop_CAName =
CaMgm::autoYaSTSettings["CAName"]:"YaST_Default_CA";
@@ -618,7 +618,7 @@
}
Progress::NextStage();
-
+
// write settings
if (success)
@@ -635,18 +635,18 @@
|| !importret)
{
success = false;
- }
+ }
}
else
{
- success = create_default_CA_certificate();
+ success = create_default_CA_certificate();
}
}
if (!success)
{
/* Error message */
Report::Error (_("Cannot create certificates."));
- }
+ }
sleep(sl);
@@ -690,14 +690,14 @@
{
domain = strip(retmap["stdout"]:"site");
}
-
+
if(found)
{
map serverCertDN = servercert["DN_HASH"]:$[];
map serverCertIssuer = servercert["ISSUER_HASH"]:$[];
-
- CaMgm::autoYaSTSettings["takeLocalServerName"] = false;
+
+ CaMgm::autoYaSTSettings["takeLocalServerName"] = false;
CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE";
CaMgm::autoYaSTSettings["server_commonName"] =
((list)serverCertDN["CN"]:[])[0]:(hostname + "." + domain);
CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA";
@@ -711,7 +711,7 @@
}
else
{
- CaMgm::autoYaSTSettings["takeLocalServerName"] = true;
+ CaMgm::autoYaSTSettings["takeLocalServerName"] = true;
CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE";
CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA";
CaMgm::autoYaSTSettings["ca_commonName"] = "YaST Default CA " +
"(" + domain + ")";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/ca_mgm_proposal.ycp
new/yast2-ca-management-2.21.8/src/ca_mgm_proposal.ycp
--- old/yast2-ca-management-2.21.5/src/ca_mgm_proposal.ycp 2011-09-08
15:57:20.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/ca_mgm_proposal.ycp 2011-09-29
11:03:03.000000000 +0200
@@ -11,7 +11,7 @@
* Authors:
* Stefan Schubert <[email protected]>
*
- * $Id: ca_mgm_proposal.ycp 64348 2011-06-14 12:53:17Z jreidinger $
+ * $Id: ca_mgm_proposal.ycp 66136 2011-09-29 09:03:02Z mcalmer $
*
* Proposal function dispatcher for CA Management
*/
@@ -56,7 +56,7 @@
string hostname_bak = "";
if (size(CaMgm::prop_subject_alt_name_list) <= 0){
CaMgm::prop_subject_alt_name_list = [];
-
+
foreach(string key, string value, host_ips, {
if(value == "DNS")
{
@@ -68,7 +68,7 @@
CaMgm::prop_subject_alt_name_list = add
(CaMgm::prop_subject_alt_name_list, elem);
});
}
-
+
map retmap = (map) SCR::Execute (.target.bash_output,
"/bin/hostname --long",
$[] );
@@ -94,7 +94,7 @@
retmap["stdout"] = hostname_bak;
}
}
-
+
string longhostname = strip(retmap["stdout"]:"");
if ( longhostname == nil ) longhostname = ""; // (bnc#428101)
@@ -106,12 +106,12 @@
if ( hostname == nil ) hostname = ""; // (bnc#428101)
string domain = substring (longhostname,
findfirstof(longhostname,".")+1);
if ( domain == nil ) domain = ""; // (bnc#428101)
-
+
if (size (domain) <= 0)
{
domain = longhostname;
}
-
+
if (!CaMgm::prop_ca_commonNameChanged)
{
CaMgm::prop_ca_commonName = "YaST Default CA (" +
hostname + ")";
@@ -128,12 +128,12 @@
{
CaMgm::prop_email = "postmaster@" + domain;
}
-
+
if(ret["warning"]:"" != "")
{
return ret;
}
-
+
// new handling of force reset because of (#238754)
if (force_reset)
@@ -185,8 +185,8 @@
"inForm":"PEM"
]);
CaMgm::prop_settingsWritten = defaultRootCA != nil ?
true:false;
-
-
+
+
if (CaMgm::prop_settingsWritten)
{
if( CaMgm::prop_keep_ca || !Popup::YesNo(_("CA
Management") + "\n" +
@@ -200,7 +200,7 @@
"type":"parsed",
"datatype":"CERTIFICATE",
"inForm":"PEM" ]);
-
+
map defaultServerCertIssuer =
defaultServerCert["ISSUER_HASH"]:$[];
// CaMgm::prop_selection = `def;
CaMgm::prop_ca_commonName =
((list)defaultServerCertIssuer["CN"]:[])[0]:"";
@@ -209,9 +209,9 @@
CaMgm::prop_CAName =
CaMgm::prop_CAName;
map defaultSCmap =
defaultServerCert["DN_HASH"]:$[];
-
+
CaMgm::prop_server_commonName =
((list)defaultSCmap["CN"]:[])[0]:"";
-
+
ret = $[ "workflow_sequence" : `auto ];
}
@@ -276,7 +276,7 @@
}
if ( size(pw1) < 4)
{
- Popup::Error(_("The
password is too short for use as the password for the certificates.
+ Popup::Error(_("The
password is too short for use as the password for the certificates.
Enter a valid password for the certificates or disable certificate creation.
"));
continue;
@@ -292,7 +292,7 @@
break;
}
}
-
+
UI::CloseDialog ();
}
if (CaMgm::prop_keep_ca)
@@ -311,14 +311,14 @@
proposal = HTML::Para(_("Creating default CA
and certificate.")
+
HTML::Newline());
}
-
+
string passwordString = (string)
(CaMgm::prop_passwordChanged ? _("[manually set]") : _("[root password]"));
string subAltName = "";
foreach(map elem, CaMgm::prop_subject_alt_name_list, {
subAltName =
subAltName + elem["kind"]:"" + ":" + elem["name"]:"" + " ";
});
-
+
proposal = proposal+ HTML::List( [ _("CA Name: ") +
CaMgm::prop_CAName,
_("Common Name: ") + CaMgm::prop_ca_commonName,
_("Server Name: ") + CaMgm::prop_server_commonName,
@@ -327,10 +327,10 @@
_("E-Mail: ") + CaMgm::prop_email,
_("Alternative Names: ") + subAltName,
] );
-
+
if ( !CaMgm::prop_keep_ca && size(CaMgm::prop_password)
< 4)
{
- ret = add( ret, "warning", _("The root password
is too short for use as the password for the certificates.
+ ret = add( ret, "warning", _("The root password
is too short for use as the password for the certificates.
Enter a valid password for the certificates or disable certificate creation.
"));
ret = add( ret, "warning_level", `blocker );
@@ -344,7 +344,7 @@
{
proposal = HTML::Para(_("Importing a CA and certificate
from file"));
}
-
+
ret = add (ret, "preformatted_proposal", proposal);
if ( ((list<string>) splitstring
(CaMgm::prop_server_commonName, "."))[0]:"" == "linux")
{
@@ -398,7 +398,7 @@
else if (func == "Write")
{
boolean success = true;
-
+
if (!CaMgm::prop_settingsWritten)
{
if (CaMgm::prop_selection == `def)
@@ -414,7 +414,7 @@
CaMgm::prop_settingsWritten = true;
}
}
-
+
ret = $[ "success" : success ];
}
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ca-management-2.21.5/src/ca_select_proposal.ycp
new/yast2-ca-management-2.21.8/src/ca_select_proposal.ycp
--- old/yast2-ca-management-2.21.5/src/ca_select_proposal.ycp 2011-09-08
15:57:20.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/ca_select_proposal.ycp 2011-09-29
10:53:30.000000000 +0200
@@ -11,7 +11,7 @@
* Summary:
*
*
- * $Id: ca_select_proposal.ycp 64402 2011-06-16 10:47:37Z jreidinger $
+ * $Id: ca_select_proposal.ycp 66042 2011-09-26 12:02:44Z visnov $
*
*/
{
@@ -203,7 +203,7 @@
define any editDefaultEntries () ``{
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopIcon("ca_mgm");
string help_text = _("<p>
YaST generates a <b>default CA and certificate</b> automatically. This CA and
certificate
is used for communicating with the <b>Apache server</b>.
@@ -357,7 +357,7 @@
* MAIN module
* ----------------------------------------------------------------------*/
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopIcon("ca_mgm");
string heading = _("Managing CAs and Certificates");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/certificate.ycp
new/yast2-ca-management-2.21.8/src/certificate.ycp
--- old/yast2-ca-management-2.21.5/src/certificate.ycp 2008-07-02
17:48:43.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/certificate.ycp 2011-09-29
10:53:30.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Stefan Schubert <[email protected]>
*
- * $Id: certificate.ycp 48787 2008-07-02 15:48:42Z mcalmer $
+ * $Id: certificate.ycp 66042 2011-09-26 12:02:44Z visnov $
*
* Showing and hadling CA certificates
*
@@ -62,7 +62,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
@@ -86,7 +86,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/common_cert.ycp
new/yast2-ca-management-2.21.8/src/common_cert.ycp
--- old/yast2-ca-management-2.21.5/src/common_cert.ycp 2011-09-12
10:12:25.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/common_cert.ycp 2011-09-29
10:53:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Main file
* Authors: Stefan Schubert <[email protected]>
*
- * $Id: common_cert.ycp 65649 2011-09-12 08:12:23Z mcalmer $
+ * $Id: common_cert.ycp 66042 2011-09-26 12:02:44Z visnov $
*
* Showing current common server certificate
*/
@@ -35,7 +35,7 @@
define symbol MainSequence () {
Wizard::CreateDialog();
-Wizard::SetDesktopIcon("ca-management");
+Wizard::SetDesktopTitleAndIcon("common_cert");
// help text 1/8
string helptext = _("<p>A Server Certificate is used by services which provide
SSL/TLS encrypted network connections.</p>");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/crlExport.ycp
new/yast2-ca-management-2.21.8/src/crlExport.ycp
--- old/yast2-ca-management-2.21.5/src/crlExport.ycp 2008-12-12
10:25:49.000000000 +0100
+++ new/yast2-ca-management-2.21.8/src/crlExport.ycp 2011-09-29
10:59:46.000000000 +0200
@@ -60,7 +60,7 @@
define void showSecurityInfo()
{
Popup::LongText(
- // Translators: window caption
+ // Translators: window caption
_("Security Information"),
// Translators: long help text - security information
`RichText(_("Warning!<br>Activating the automatic creation
and export of a CRL will write the CA password to a configuration file on disk.
The password will be stored there in plain text as it is needed to create a
CRL. The file will only be readable for the root user.")),
@@ -120,7 +120,7 @@
define void readSettings(string ca)
{
string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca,
" "));
- if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0 )
+ if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", String::Quote
(crlConf) ) ) == 0 )
{
SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini(
`IniAgent( crlConf, crlConfFormat )) );
@@ -160,9 +160,9 @@
define void writeSettings(string ca)
{
string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca,
" "));
- if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0))
+ if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", String::Quote
(crlConf)) ) == 0))
{
- SCR::Execute(.target.bash, sformat("umask 0077 && touch %1",
crlConf) );
+ SCR::Execute(.target.bash, sformat("umask 0077 && touch %1",
String::Quote (crlConf)) );
}
SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini(
@@ -240,7 +240,7 @@
`VBox(`VSpacing(1),
`PushButton(`id(`askFile), Label::BrowseButton() ))
),
`Left( `RadioButtonGroup(`id(`fileformat),
- `HBox(
+ `HBox(
`Label(_("Export Format")),
`RadioButton(`id(`ffpem),
`opt(`notify), _("PEM Format"), true ),
`RadioButton(`id(`ffder),
`opt(`notify), _("DER Format") )
@@ -276,7 +276,7 @@
`Left( `CheckBox(`id(`exportFile),
`opt(`notify), _("Export to file"), true )),
`HBox( `HSpacing(hspace),
cfilesettings ),
`VSpacing(vspace),
- `Left( `CheckBox(`id(`exportLDAP),
`opt(`notify), _("Export to LDAP"), false )),
+ `Left( `CheckBox(`id(`exportLDAP),
`opt(`notify), _("Export to LDAP"), false )),
`HBox( `HSpacing(hspace),
cldapsettings ),
`VSpacing(vspace),
cinterval
@@ -308,7 +308,7 @@
if (ui == `askFile)
{
string fformat = "*.pem";
- if (fileformat == `ffder) fformat = "*.der";
+ if (fileformat == `ffder) fformat = "*.der";
string newcrlfile = UI::AskForSaveFileName( crlfile, fformat,
_("Save as") );
if (newcrlfile != nil && newcrlfile != "") crlfile = newcrlfile;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/request.ycp
new/yast2-ca-management-2.21.8/src/request.ycp
--- old/yast2-ca-management-2.21.5/src/request.ycp 2008-07-02
17:48:43.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/request.ycp 2011-09-29
12:25:52.000000000 +0200
@@ -12,7 +12,7 @@
* Authors:
* Stefan Schubert <[email protected]>
*
- * $Id: request.ycp 48787 2008-07-02 15:48:42Z mcalmer $
+ * $Id: request.ycp 66150 2011-09-29 10:25:50Z mcalmer $
*
* Showing and hadling CA requests
*
@@ -25,18 +25,18 @@
import "Wizard";
import "Label";
import "Popup";
-
+
textdomain "ca-management";
-
+
include "ca-management/signRequest.ycp";
-
+
define list<string> requestID = [];
// help text 1/6
string requestHelptext = _("<p>First, see a list view with all available
requests of this CA. The columns are the DN of the request including the e-mail
address.</p>");
- // help text 2/6
+ // help text 2/6
requestHelptext = requestHelptext + _("<p>Select one of the requests and
execute some actions.</p>");
- // help text 3/6
+ // help text 3/6
requestHelptext = requestHelptext + _("<p><b>View</b> opens a window with
a text representation of the complete request.</p>");
// help text 4/6
requestHelptext = requestHelptext + _("<p>You can also <b>Sign</b>,
<b>Delete</b>, or <b>Export</b> a request.</p>");
@@ -54,7 +54,7 @@
map aliases = $[
"new_certinit" : ``(new_cert_init ("Client Request")),
- "new_certSaveDef" : ``(new_cert_save_default ()),
+ "new_certSaveDef" : ``(new_cert_save_default ()),
"new_cert1" : ``(new_cert1 ("Client Request")),
"new_cert2" : ``(new_cert2 ("Client Request")),
"new_cert3" : ``(new_cert3 ("Client Request")),
@@ -62,7 +62,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
@@ -78,7 +78,7 @@
map aliases = $[
"new_certinit" : ``(new_cert_init ("Server Request")),
- "new_certSaveDef" : ``(new_cert_save_default ()),
+ "new_certSaveDef" : ``(new_cert_save_default ()),
"new_cert1" : ``(new_cert1 ("Server Request")),
"new_cert2" : ``(new_cert2 ("Server Request")),
"new_cert3" : ``(new_cert3 ("Server Request")),
@@ -86,7 +86,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
@@ -102,7 +102,7 @@
map aliases = $[
"new_certinit" : ``(new_cert_init ("Sub CA Request")),
- "new_certSaveDef" : ``(new_cert_save_default ()),
+ "new_certSaveDef" : ``(new_cert_save_default ()),
"new_cert1" : ``(new_cert1 ("Sub CA Request")),
"new_cert2" : ``(new_cert2 ("Sub CA Request")),
"new_cert3" : ``(new_cert3 ("Sub CA Request")),
@@ -110,15 +110,15 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
return ret;
- }
+ }
+
-
/**
* Signing new Request sequence
* @param kind (`signClient,`signServer,`signCA)
@@ -130,23 +130,23 @@
$["req_init" : ``(signRequestInit ("Client
Request")),
"req_sign1" : ``(signRequest1 ("Client
Request")),
"req_sign2" : ``(signRequest2 ("Client
Request")),
- "req_advanced" : ``(new_cert_advanced (false,
"Sign Request")),
+ "req_advanced" : ``(new_cert_advanced (false,
"Sign Request")),
],
`signServer:
$["req_init" : ``(signRequestInit ("Server
Request")),
"req_sign1" : ``(signRequest1 ("Server
Request")),
"req_sign2" : ``(signRequest2 ("Server
Request")),
- "req_advanced" : ``(new_cert_advanced (false,
"Sign Request")),
+ "req_advanced" : ``(new_cert_advanced (false,
"Sign Request")),
],
`signCA:
$["req_init" : ``(signRequestInit ("CA
Request")),
"req_sign1" : ``(signRequest1 ("CA
Request")),
"req_sign2" : ``(signRequest2 ("CA
Request")),
- "req_advanced" : ``(new_cert_advanced (false,
"Sign Request")),
+ "req_advanced" : ``(new_cert_advanced (false,
"Sign Request")),
]
];
-
-
+
+
map requestSequence = $[
"ws_start" : "req_init",
"req_init" : $[
@@ -169,18 +169,18 @@
"req_advanced" : $[
`abort : `abort,
`back : "req_sign2"
- ],
+ ],
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases[kind]:$[], requestSequence);
-
+
UI::CloseDialog();
return ret;
}
-
+
/**
* showLongRequestDescription - description of a request in textform
@@ -193,10 +193,10 @@
"caPasswd":getPassword(CAname),
"request":Request,
"type":"plain"]);
-
+
y2milestone("ReadRequest(%1,%2): %3", CAname, Request, ret);
ret = "<pre>" + ret + "</pre>";
-
+
if (ret == nil)
{
showErrorCaManagement ();
@@ -220,10 +220,10 @@
UI::SetFocus (`id(`ok));
UI::UserInput ();
- UI::CloseDialog ();
- }
+ UI::CloseDialog ();
+ }
}
-
+
/**
* Creates request items
*
@@ -235,7 +235,7 @@
integer i = 0;
requestID = [];
-
+
list<map> ret = (list<map>) YaPI::CaManagement::ReadRequestList
($["caName":currentCA, "caPasswd":getPassword(currentCA)]);
if (ret == nil)
{
@@ -243,10 +243,10 @@
return nil;
}
y2milestone("ReadRequestList(%1): %2", currentCA, ret);
-
+
foreach (map element, ret, ``{
- result = add (result, `item (`id (i),
+ result = add (result, `item (`id (i),
element["commonName"]:"",
element["emailAddress"]:"",
element["organizationName"]:"",
@@ -262,11 +262,11 @@
}
/**
- * Dialog Tab - request -
+ * Dialog Tab - request -
* @return term for requests of a selected CA
*/
- term getRequestTab () {
- list<term> certTermList = getRequestList (CaMgm::currentCA);
+ term getRequestTab () {
+ list<term> certTermList = getRequestList (CaMgm::currentCA);
if (certTermList == nil)
{
return nil;
@@ -285,7 +285,7 @@
_("State"),
_("Country"), _("Generate Time")),
certTermList),
`HSpacing (1)
- ),
+ ),
`HBox (
`HSpacing (1),
`RichText(`id(`textinfo),""),
@@ -297,11 +297,11 @@
`HSpacing (1),
`MenuButton( _("Add"),
[
- `item(`id(`addCARequest),
_("Add Sub-CA Request") ),
+ `item(`id(`addCARequest),
_("Add Sub-CA Request") ),
`item(`id(`addServerRequest), _("Add Server Request") ),
`item(`id(`addClientRequest), _("Add Client Request") )
]
- ),
+ ),
`HStretch(),
`MenuButton(`id(`request),
_("&Request"),
@@ -314,8 +314,8 @@
`item(`id(`signServer), _("As Server Certificate") ),
`item(`id(`signCA),
_("As CA Certificate") )
]),
- `item(`id(`delete),
_("&Delete") ) //,
- //`item(`id(`exportFile),
_("Export to File") )
+ `item(`id(`delete),
_("&Delete") ),
+ `item(`id(`exportFile),
_("Export to File") )
]
),
`HSpacing (1)
@@ -324,17 +324,17 @@
);
return contents;
}
-
+
/**
* Initialize the tab of the dialog
*/
void initRequestTab () {
boolean anyitems = UI::QueryWidget (`id (`table), `CurrentItem) != nil;
UI::ChangeWidget (`id (`request), `Enabled, anyitems);
-
+
integer id = (integer) UI::QueryWidget (`id (`table), `CurrentItem);
CaMgm::currentRequest = (string) requestID[id]:"";
-
+
if (anyitems)
{
map ret = (map) YaPI::CaManagement::ReadRequest
($["caName":CaMgm::currentCA,
@@ -346,9 +346,9 @@
// Add generation time to map
term itemTerm = (term) UI::QueryWidget(`id(`table), `Item(id));
ret = add (ret, "date", itemTerm[8]:"");
-
+
UI::ChangeWidget( `id(`textinfo), `Value, getRequestDescription
(ret, false));
- }
+ }
}
@@ -362,12 +362,12 @@
{
initRequestTab ();
}
-
+
if (ui == `view)
{
showLongRequestDescription (CaMgm::currentCA,
- CaMgm::currentRequest);
- }
+ CaMgm::currentRequest);
+ }
if(ui == `reqcpw)
{
// we need to fake a certificate name
@@ -399,32 +399,48 @@
|| ui == `signCA)
{
signRequestSequence (ui);
- ui = `again;
+ ui = `again;
}
if (ui == `exportFile)
{
- Popup::Error(_("Currently not supported."));
+ //Popup::Error(_("Currently not supported."));
+ string newreqfile = UI::AskForSaveFileName( ".", "*", _("Save as")
);
+ if (newreqfile != nil && newreqfile != "")
+ {
+ string ret = (string) YaPI::CaManagement::ExportRequest ($[
"caName": CaMgm::currentCA,
+
"caPasswd": getPassword(CaMgm::currentCA),
+
"request": CaMgm::currentRequest,
+
"destinationFile": newreqfile]);
+ if (ret != nil && ret == "1")
+ {
+ Popup::Message(_("Saved to file successfully"));
+ }
+ else
+ {
+ showErrorCaManagement();
+ }
+ }
}
if (ui == `import)
{
importRequestFromDisk (CaMgm::currentCA);
- ui = `again;
+ ui = `again;
}
if (ui == `addCARequest)
{
newCARequestSequence ();
- ui = `again;
- }
+ ui = `again;
+ }
if (ui == `addServerRequest)
{
newServerRequestSequence ();
- ui = `again;
+ ui = `again;
}
if (ui == `addClientRequest)
{
newClientRequestSequence ();
- ui = `again;
- }
+ ui = `again;
+ }
return (symbol)ui;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/util.ycp
new/yast2-ca-management-2.21.8/src/util.ycp
--- old/yast2-ca-management-2.21.5/src/util.ycp 2011-09-19 12:36:54.000000000
+0200
+++ new/yast2-ca-management-2.21.8/src/util.ycp 2011-09-29 10:53:30.000000000
+0200
@@ -4,7 +4,7 @@
* Summary: Util definitions
* Authors: Stefan Schubert ([email protected])
*
- * $Id: util.ycp 65787 2011-09-19 10:36:53Z mcalmer $
+ * $Id: util.ycp 66042 2011-09-26 12:02:44Z visnov $
*/
{
@@ -1083,7 +1083,7 @@
");
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
Wizard::SetContents( _("Importing Common Certificate from Disk"),
contents,
help_text,
true, true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ca-management-2.21.5/src/wizards.ycp
new/yast2-ca-management-2.21.8/src/wizards.ycp
--- old/yast2-ca-management-2.21.5/src/wizards.ycp 2008-05-13
17:59:13.000000000 +0200
+++ new/yast2-ca-management-2.21.8/src/wizards.ycp 2011-09-29
10:53:30.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Stefan Schubert <[email protected]>
*
- * $Id: wizards.ycp 47500 2008-05-13 15:59:13Z mcalmer $
+ * $Id: wizards.ycp 66042 2011-09-26 12:02:44Z visnov $
*/
{
@@ -39,7 +39,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, CaMgm::certificateSequence);
UI::CloseDialog();
@@ -91,7 +91,7 @@
];
Wizard::CreateDialog();
- Wizard::SetDesktopIcon("ca-management");
+ Wizard::SetDesktopTitleAndIcon("ca_mgm");
symbol ret = WizardSequencer(aliases, sequence);
UI::CloseDialog();
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
