Commit d2e0c817 authored by Richard Levitte's avatar Richard Levitte
Browse files

The private key should never have ended up in newreq.pem. 

Now, it ends up in newkey.pem instead.
parent 109080ae

apps/CA.pl.in

+8 −7
Original line number Diff line number Diff line
@@ -68,19 +68,19 @@ foreach (@ARGV) { 
	    exit 0;

	} elsif (/^-newcert$/) {

	    # create a certificate

	    system ("$REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS");

	    system ("$REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS");

	    $RET=$?;

	    print "Certificate (and private key) is in newreq.pem\n"

	    print "Certificate is in newcert.pem, private key is in newkey.pem\n"

	} elsif (/^-newreq$/) {

	    # create a certificate request

	    system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");

	    system ("$REQ -new -keyout newkey.pem -out newreq.pem $DAYS");

	    $RET=$?;

	    print "Request (and private key) is in newreq.pem\n";

	    print "Request is in newreq.pem, private key is in newkey.pem\n";

	} elsif (/^-newreq-nodes$/) {

	    # create a certificate request

	    system ("$REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS");

	    system ("$REQ -new -nodes -keyout newkey.pem -out newreq.pem $DAYS");

	    $RET=$?;

	    print "Request (and private key) is in newreq.pem\n";

	    print "Request is in newreq.pem, private key is in newkey.pem\n";

	} elsif (/^-newca$/) {

		# if explicitly asked for or it doesn't exist then setup the

		# directory structure that Eric likes to manage things
@@ -120,10 +120,11 @@ foreach (@ARGV) { 
	} elsif (/^-pkcs12$/) {

	    my $cname = $ARGV[1];

	    $cname = "My Certificate" unless defined $cname;

	    system ("$PKCS12 -in newcert.pem -inkey newreq.pem " .

	    system ("$PKCS12 -in newcert.pem -inkey newkey.pem " .

			"-certfile ${CATOP}/$CACERT -out newcert.p12 " .

			"-export -name \"$cname\"");

	    $RET=$?;

	    print "PKCS #12 file is in newcert.p12\n";

	    exit $RET;

	} elsif (/^-xsign$/) {

	    system ("$CA -policy policy_anything -infiles newreq.pem");

apps/CA.sh

+4 −4
Original line number Diff line number Diff line
@@ -53,15 +53,15 @@ case $i in 
    ;;

-newcert) 

    # create a certificate

    $REQ -new -x509 -keyout newreq.pem -out newreq.pem $DAYS

    $REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS

    RET=$?

    echo "Certificate (and private key) is in newreq.pem"

    echo "Certificate is in newcert.pem, private key is in newkey.pem"

    ;;

-newreq) 

    # create a certificate request

    $REQ -new -keyout newreq.pem -out newreq.pem $DAYS

    $REQ -new -keyout newkey.pem -out newreq.pem $DAYS

    RET=$?

    echo "Request (and private key) is in newreq.pem"

    echo "Request is in newreq.pem, private key is in newkey.pem"

    ;;

-newca)     

    # if explicitly asked for or it doesn't exist then setup the directory