[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1e2804f25c80136c33f3508adb54b24106b6b6f6 (commit)
      from  822b5e2645a99bea15329bd66c9723c7e7119cdb (commit)


- Log -----------------------------------------------------------------
commit 1e2804f25c80136c33f3508adb54b24106b6b6f6
Author: Markus Sauermann <openssl at sauermann-consulting.de>
Date:   Sun Dec 3 13:23:21 2017 +0100

    Adjusted Argument Indices
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4835)

-----------------------------------------------------------------------

Summary of changes:
 apps/CA.pl.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/CA.pl.in b/apps/CA.pl.in
index 6306fa4..784c22f 100644
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -163,7 +163,7 @@ if ($WHAT eq '-newcert' ) {
         print "CA certificate is in ${CATOP}/$CACERT\n" if $RET == 0;
     }
 } elsif ($WHAT eq '-pkcs12' ) {
-    my $cname = $ARGV[1];
+    my $cname = $ARGV[0];
     $cname = "My Certificate" unless defined $cname;
     $RET = run("$PKCS12 -in $NEWCERT -inkey $NEWKEY"
             . " -certfile ${CATOP}/$CACERT"
@@ -196,12 +196,12 @@ if ($WHAT eq '-newcert' ) {
     $RET = run("$CA -gencrl -out ${CATOP}/crl/$CACRL $EXTRA{ca}");
     print "Generated CRL is in ${CATOP}/crl/$CACRL\n" if $RET == 0;
 } elsif ($WHAT eq '-revoke' ) {
-    my $cname = $ARGV[1];
+    my $cname = $ARGV[0];
     if (!defined $cname) {
         print "Certificate filename is required; reason optional.\n";
         exit 1;
     }
-    my $reason = $ARGV[2];
+    my $reason = $ARGV[1];
     $reason = " -crl_reason $reason"
         if defined $reason && crl_reason_ok($reason);
     $RET = run("$CA -revoke \"$cname\"" . $reason . $EXTRA{ca});