rpms/crypto-utils/devel genkey.pl,1.9,1.10

[Elio Maldonado (emaldonado)]

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22134

Modified Files:
	genkey.pl 
Log Message:
Synch. with keyutil.c: -f for module acces password and -e for key encryption password (#346731)


Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- genkey.pl	1 May 2008 01:20:07 -0000	1.9
+++ genkey.pl	2 May 2008 23:48:28 -0000	1.10
@@ -775,7 +775,7 @@
     $args .= "-g $bits ";
     $args .= "-v $months "; 
     $args .= "-f $pwdfile " if $pwdfile;
-    $args .= "-z $noisefile "; 
+    $args .= "-z $noisefile " if $noisefile;
     $args .= "-d $modNssDbDir "; 
     $args .= "-o $certfile";
     
@@ -811,9 +811,9 @@
     $args .= "-a ";              ## using ascii 
     $args .= "-k rsa ";
     $args .= "-g $bits ";
-    $args .= "-f $pwdfile ";
+    $args .= "-f $pwdfile "   if $pwdfile;
     $args .= "-v $months "; 
-    $args .= "-z $noisefile ";
+    $args .= "-z $noisefile " if $noisefile;
     
     $args .= " > $csrfile ";
     
@@ -849,7 +849,9 @@
     $args   .= "-s $subject ";
     $args   .= "-v $months "; 
     $args   .= "-z $noisefile ";
-    $args   .= "-f $pwdfile "     if $pwdfile; # sometimes there is no password
+    $args   .= "-e $pwdfile " if $pwdfile; 
+              # there is no password when the
+              # user wants the key in the clar
     $args   .= "-o $certfile ";
     $args   .= "-k $keyfile";
 
@@ -893,13 +895,15 @@
             
     # build the arguments for a gen request call
     my $cmd="$ssltop/keyutil";
-    my $args = " -c genreq ";
+    my $args = "-c genreq ";
     $args   .= "-g $bits "; 
     $args   .= "-s $subject ";
     $args   .= "-v $months "; 
     $args   .= "-o $csrfile ";
     $args   .= "-k $keyfile "; 
-    $args   .= "-f $pwdfile "    if $pwdfile;
+    $args   .= "-e $pwdfile " if $pwdfile;
+              # there is no password when the
+              # user wants the key in the clar
     $args   .= "-z $noisefile "  if $noisefile;
  
     nssUtilCmd($debug, $cmd, $args,