Rename CA.pl to CA.pl.in (no actual changes), and let Configure

set the #! line with the path to Perl.

Submitted by: Peter Jones

diff --git a/Configure b/Configure
index 6fad77b01619363769597f9a9510935b9df9f472..af14a59778b113f53fc4a6a0c9338bd6e1515602 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -755,9 +755,11 @@ EOF
        &dofile("tools/c_rehash",$openssldir,'^DIR=',   'DIR=%s',);
        if ( $perl =~ m@^/@) {
            &dofile("apps/der_chop",$perl,'^#!/', '#!%s');
+           &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
        } else {
            # No path for Perl known ...
            &dofile("apps/der_chop",'/usr/local/bin/perl','^#!/', '#!%s');
+           &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
        }           
 }
 

diff --git a/apps/CA.pl b/apps/CA.pl
deleted file mode 100755 (executable)
index 7c023ae..0000000
--- a/apps/CA.pl
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/usr/local/bin/perl
-#
-# CA - wrapper around ca to make it easier to use ... basically ca requires
-#      some setup stuff to be done before you can use it and this makes
-#      things easier between now and when Eric is convinced to fix it :-)
-#
-# CA -newca ... will setup the right stuff
-# CA -newreq ... will generate a certificate request 
-# CA -sign ... will sign the generated request and output 
-#
-# At the end of that grab newreq.pem and newcert.pem (one has the key 
-# and the other the certificate) and cat them together and that is what
-# you want/need ... I'll make even this a little cleaner later.
-#
-#
-# 12-Jan-96 tjh    Added more things ... including CA -signcert which
-#                  converts a certificate to a request and then signs it.
-# 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG
-#                 environment variable so this can be driven from
-#                 a script.
-# 25-Jul-96 eay    Cleaned up filenames some more.
-# 11-Jun-96 eay    Fixed a few filename missmatches.
-# 03-May-96 eay    Modified to use 'ssleay cmd' instead of 'cmd'.
-# 18-Apr-96 tjh    Original hacking
-#
-# Tim Hudson
-# tjh@cryptsoft.com
-#
-
-# 27-Apr-98 snh    Translation into perl, fix existing CA bug.
-#
-#
-# Steve Henson
-# shenson@bigfoot.com
-
-# default openssl.cnf file has setup as per the following
-# demoCA ... where everything is stored
-
-$DAYS="-days 365";
-$REQ="openssl req $SSLEAY_CONFIG";
-$CA="openssl ca $SSLEAY_CONFIG";
-$VERIFY="openssl verify";
-$X509="openssl x509";
-
-$CATOP="./demoCA";
-$CAKEY="cakey.pem";
-$CACERT="cacert.pem";
-
-$DIRMODE = 0777;
-
-$RET = 0;
-
-foreach (@ARGV) {
-       if ( /^(-\?|-h|-help)$/ ) {
-           print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
-           exit 0;
-       } elsif (/^-newcert$/) {
-           # create a certificate
-           system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
-           $RET=$?;
-           print "Certificate (and private key) is in newreq.pem\n"
-       } elsif (/^-newreq$/) {
-           # create a certificate request
-           system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
-           $RET=$?;
-           print "Request (and private key) is in newreq.pem\n";
-       } elsif (/^-newca$/) {
-               # if explictly asked for or it doesn't exist then setup the
-               # directory structure that Eric likes to manage things 
-           $NEW="1";
-           if ( "$NEW" || ! -f "${CATOP}/serial" ) {
-               # create the directory hierarchy
-               mkdir $CATOP, $DIRMODE;
-               mkdir "${CATOP}/certs", $DIRMODE;
-               mkdir "${CATOP}/crl", $DIRMODE ;
-               mkdir "${CATOP}/newcerts", $DIRMODE;
-               mkdir "${CATOP}/private", $DIRMODE;
-               open OUT, ">${CATOP}/serial";
-               print OUT "01\n";
-               close OUT;
-               open OUT, ">${CATOP}/index.txt";
-               close OUT;
-           }
-           if ( ! -f "${CATOP}/private/$CAKEY" ) {
-               print "CA certificate filename (or enter to create)\n";
-               $FILE = <STDIN>;
-
-               chop $FILE;
-
-               # ask user for existing CA certificate
-               if ($FILE) {
-                   cp_pem($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
-                   cp_pem($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
-                   $RET=$?;
-               } else {
-                   print "Making CA certificate ...\n";
-                   system ("$REQ -new -x509 -keyout " .
-                       "${CATOP}/private/$CAKEY -out ${CATOP}/$CACERT $DAYS");
-                   $RET=$?;
-               }
-           }
-       } elsif (/^-xsign$/) {
-           system ("$CA -policy policy_anything -infiles newreq.pem");
-           $RET=$?;
-       } elsif (/^(-sign|-signreq)$/) {
-           system ("$CA -policy policy_anything -out newcert.pem " .
-                                                       "-infiles newreq.pem");
-           $RET=$?;
-           print "Signed certificate is in newcert.pem\n";
-       } elsif (/^-signcert$/) {
-           system ("$X509 -x509toreq -in newreq.pem -signkey newreq.pem " .
-                                                               "-out tmp.pem");
-           system ("$CA -policy policy_anything -out newcert.pem " .
-                                                       "-infiles tmp.pem");
-           $RET = $?;
-           print "Signed certificate is in newcert.pem\n";
-       } elsif (/^-verify$/) {
-           if (shift) {
-               foreach $j (@ARGV) {
-                   system ("$VERIFY -CAfile $CATOP/$CACERT $j");
-                   $RET=$? if ($? != 0);
-               }
-               exit $RET;
-           } else {
-                   system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
-                   $RET=$?;
-                   exit 0;
-           }
-       } else {
-           print STDERR "Unknown arg $_\n";
-           print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
-           exit 1;
-       }
-}
-
-exit $RET;
-
-sub cp_pem {
-my ($infile, $outfile, $bound) = @_;
-open IN, $infile;
-open OUT, ">$outfile";
-my $flag = 0;
-while (<IN>) {
-       $flag = 1 if (/^-----BEGIN.*$bound/) ;
-       print OUT $_ if ($flag);
-       if (/^-----END.*$bound/) {
-               close IN;
-               close OUT;
-               return;
-       }
-}
-}
-

diff --git a/apps/CA.pl.in b/apps/CA.pl.in
new file mode 100644 (file)
index 0000000..7c023ae
--- /dev/null
+++ b/apps/CA.pl.in
@@ -0,0 +1,153 @@
+#!/usr/local/bin/perl
+#
+# CA - wrapper around ca to make it easier to use ... basically ca requires
+#      some setup stuff to be done before you can use it and this makes
+#      things easier between now and when Eric is convinced to fix it :-)
+#
+# CA -newca ... will setup the right stuff
+# CA -newreq ... will generate a certificate request 
+# CA -sign ... will sign the generated request and output 
+#
+# At the end of that grab newreq.pem and newcert.pem (one has the key 
+# and the other the certificate) and cat them together and that is what
+# you want/need ... I'll make even this a little cleaner later.
+#
+#
+# 12-Jan-96 tjh    Added more things ... including CA -signcert which
+#                  converts a certificate to a request and then signs it.
+# 10-Jan-96 eay    Fixed a few more bugs and added the SSLEAY_CONFIG
+#                 environment variable so this can be driven from
+#                 a script.
+# 25-Jul-96 eay    Cleaned up filenames some more.
+# 11-Jun-96 eay    Fixed a few filename missmatches.
+# 03-May-96 eay    Modified to use 'ssleay cmd' instead of 'cmd'.
+# 18-Apr-96 tjh    Original hacking
+#
+# Tim Hudson
+# tjh@cryptsoft.com
+#
+
+# 27-Apr-98 snh    Translation into perl, fix existing CA bug.
+#
+#
+# Steve Henson
+# shenson@bigfoot.com
+
+# default openssl.cnf file has setup as per the following
+# demoCA ... where everything is stored
+
+$DAYS="-days 365";
+$REQ="openssl req $SSLEAY_CONFIG";
+$CA="openssl ca $SSLEAY_CONFIG";
+$VERIFY="openssl verify";
+$X509="openssl x509";
+
+$CATOP="./demoCA";
+$CAKEY="cakey.pem";
+$CACERT="cacert.pem";
+
+$DIRMODE = 0777;
+
+$RET = 0;
+
+foreach (@ARGV) {
+       if ( /^(-\?|-h|-help)$/ ) {
+           print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
+           exit 0;
+       } elsif (/^-newcert$/) {
+           # create a certificate
+           system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");
+           $RET=$?;
+           print "Certificate (and private key) is in newreq.pem\n"
+       } elsif (/^-newreq$/) {
+           # create a certificate request
+           system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
+           $RET=$?;
+           print "Request (and private key) is in newreq.pem\n";
+       } elsif (/^-newca$/) {
+               # if explictly asked for or it doesn't exist then setup the
+               # directory structure that Eric likes to manage things 
+           $NEW="1";
+           if ( "$NEW" || ! -f "${CATOP}/serial" ) {
+               # create the directory hierarchy
+               mkdir $CATOP, $DIRMODE;
+               mkdir "${CATOP}/certs", $DIRMODE;
+               mkdir "${CATOP}/crl", $DIRMODE ;
+               mkdir "${CATOP}/newcerts", $DIRMODE;
+               mkdir "${CATOP}/private", $DIRMODE;
+               open OUT, ">${CATOP}/serial";
+               print OUT "01\n";
+               close OUT;
+               open OUT, ">${CATOP}/index.txt";
+               close OUT;
+           }
+           if ( ! -f "${CATOP}/private/$CAKEY" ) {
+               print "CA certificate filename (or enter to create)\n";
+               $FILE = <STDIN>;
+
+               chop $FILE;
+
+               # ask user for existing CA certificate
+               if ($FILE) {
+                   cp_pem($FILE,"${CATOP}/private/$CAKEY", "PRIVATE");
+                   cp_pem($FILE,"${CATOP}/$CACERT", "CERTIFICATE");
+                   $RET=$?;
+               } else {
+                   print "Making CA certificate ...\n";
+                   system ("$REQ -new -x509 -keyout " .
+                       "${CATOP}/private/$CAKEY -out ${CATOP}/$CACERT $DAYS");
+                   $RET=$?;
+               }
+           }
+       } elsif (/^-xsign$/) {
+           system ("$CA -policy policy_anything -infiles newreq.pem");
+           $RET=$?;
+       } elsif (/^(-sign|-signreq)$/) {
+           system ("$CA -policy policy_anything -out newcert.pem " .
+                                                       "-infiles newreq.pem");
+           $RET=$?;
+           print "Signed certificate is in newcert.pem\n";
+       } elsif (/^-signcert$/) {
+           system ("$X509 -x509toreq -in newreq.pem -signkey newreq.pem " .
+                                                               "-out tmp.pem");
+           system ("$CA -policy policy_anything -out newcert.pem " .
+                                                       "-infiles tmp.pem");
+           $RET = $?;
+           print "Signed certificate is in newcert.pem\n";
+       } elsif (/^-verify$/) {
+           if (shift) {
+               foreach $j (@ARGV) {
+                   system ("$VERIFY -CAfile $CATOP/$CACERT $j");
+                   $RET=$? if ($? != 0);
+               }
+               exit $RET;
+           } else {
+                   system ("$VERIFY -CAfile $CATOP/$CACERT newcert.pem");
+                   $RET=$?;
+                   exit 0;
+           }
+       } else {
+           print STDERR "Unknown arg $_\n";
+           print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
+           exit 1;
+       }
+}
+
+exit $RET;
+
+sub cp_pem {
+my ($infile, $outfile, $bound) = @_;
+open IN, $infile;
+open OUT, ">$outfile";
+my $flag = 0;
+while (<IN>) {
+       $flag = 1 if (/^-----BEGIN.*$bound/) ;
+       print OUT $_ if ($flag);
+       if (/^-----END.*$bound/) {
+               close IN;
+               close OUT;
+               return;
+       }
+}
+}
+