PR: 1847

Submitted by: Tomas Mraz <tmraz@redhat.com>
Approved by: steve@openssl.org

Integrated patches to CA.sh to bring it into line with CA.pl functionality.

diff --git a/apps/CA.sh b/apps/CA.sh
index a0b20d85a97546a67bebbccdce40b3947c7e00fa..7ad6b8c52e74a11fd9ab9cf70160edfbabf62fd3 100644 (file)
--- a/apps/CA.sh
+++ b/apps/CA.sh
@@ -5,10 +5,10 @@
 #      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 
+# 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 
+# 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.
 #
@@ -16,8 +16,8 @@
 # 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.
+#                  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'.
@@ -29,52 +29,87 @@
 
 # default openssl.cnf file has setup as per the following
 # demoCA ... where everything is stored
+cp_pem() {
+    infile=$1
+    outfile=$2
+    bound=$3
+    flag=0
+    exec <$infile;
+    while read line; do
+       if [ $flag -eq 1 ]; then
+               echo $line|grep "^-----END.*$bound"  2>/dev/null 1>/dev/null
+               if [ $? -eq 0 ] ; then
+                       echo $line >>$outfile
+                       break
+               else
+                       echo $line >>$outfile
+               fi
+       fi
+
+       echo $line|grep "^-----BEGIN.*$bound"  2>/dev/null 1>/dev/null
+       if [ $? -eq 0 ]; then
+               echo $line >$outfile
+               flag=1
+       fi
+    done
+}
+
+usage() {
+ echo "usage: $0 -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify" >&2
+}
 
 if [ -z "$OPENSSL" ]; then OPENSSL=openssl; fi
 
-DAYS="-days 365"       # 1 year
+if [ -z "$DAYS" ] ; then DAYS="-days 365" ; fi # 1 year
 CADAYS="-days 1095"    # 3 years
 REQ="$OPENSSL req $SSLEAY_CONFIG"
 CA="$OPENSSL ca $SSLEAY_CONFIG"
 VERIFY="$OPENSSL verify"
 X509="$OPENSSL x509"
+PKCS12="openssl pkcs12"
 
-CATOP=./demoCA
+if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
 CAKEY=./cakey.pem
 CAREQ=./careq.pem
 CACERT=./cacert.pem
 
-for i
-do
-case $i in
+RET=0
+
+while [ "$1" != "" ] ; do
+case $1 in
 -\?|-h|-help)
-    echo "usage: CA -newcert|-newreq|-newca|-sign|-verify" >&2
+    usage
     exit 0
     ;;
--newcert) 
+-newcert)
     # create a certificate
     $REQ -new -x509 -keyout newkey.pem -out newcert.pem $DAYS
     RET=$?
     echo "Certificate is in newcert.pem, private key is in newkey.pem"
     ;;
--newreq) 
+-newreq)
     # create a certificate request
     $REQ -new -keyout newkey.pem -out newreq.pem $DAYS
     RET=$?
     echo "Request is in newreq.pem, private key is in newkey.pem"
     ;;
--newca)     
+-newreq-nodes) 
+    # create a certificate request
+    $REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS
+    RET=$?
+    echo "Request (and private key) is in newreq.pem"
+    ;;
+-newca)
     # if explicitly asked for or it doesn't exist then setup the directory
-    # structure that Eric likes to manage things 
+    # structure that Eric likes to manage things
     NEW="1"
     if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
        # create the directory hierarchy
-       mkdir ${CATOP} 
-       mkdir ${CATOP}/certs 
-       mkdir ${CATOP}/crl 
-       mkdir ${CATOP}/newcerts
-       mkdir ${CATOP}/private
-       echo "00" > ${CATOP}/serial
+       mkdir -p ${CATOP}
+       mkdir -p ${CATOP}/certs
+       mkdir -p ${CATOP}/crl
+       mkdir -p ${CATOP}/newcerts
+       mkdir -p ${CATOP}/private
        touch ${CATOP}/index.txt
     fi
     if [ ! -f ${CATOP}/private/$CAKEY ]; then
@@ -83,37 +118,60 @@ case $i in
 
        # ask user for existing CA certificate
        if [ "$FILE" ]; then
-           cp $FILE ${CATOP}/private/$CAKEY
+           cp_pem $FILE ${CATOP}/private/$CAKEY PRIVATE
+           cp_pem $FILE ${CATOP}/$CACERT CERTIFICATE
            RET=$?
+           if [ ! -f "${CATOP}/serial" ]; then
+               $X509 -in ${CATOP}/$CACERT -noout -next_serial \
+                     -out ${CATOP}/serial
+           fi
        else
            echo "Making CA certificate ..."
            $REQ -new -keyout ${CATOP}/private/$CAKEY \
                           -out ${CATOP}/$CAREQ
-           $CA -out ${CATOP}/$CACERT $CADAYS -batch \
+           $CA -create_serial -out ${CATOP}/$CACERT $CADAYS -batch \
                           -keyfile ${CATOP}/private/$CAKEY -selfsign \
-                          -infiles ${CATOP}/$CAREQ 
+                          -extensions v3_ca \
+                          -infiles ${CATOP}/$CAREQ
            RET=$?
        fi
     fi
     ;;
 -xsign)
-    $CA -policy policy_anything -infiles newreq.pem 
+    $CA -policy policy_anything -infiles newreq.pem
     RET=$?
     ;;
--sign|-signreq) 
+-pkcs12)
+    if [ -z "$2" ] ; then
+       CNAME="My Certificate"
+    else
+       CNAME="$2"
+    fi
+    $PKCS12 -in newcert.pem -inkey newreq.pem -certfile ${CATOP}/$CACERT \
+           -out newcert.p12 -export -name "$CNAME"
+    RET=$?
+    exit $RET
+    ;;
+-sign|-signreq)
     $CA -policy policy_anything -out newcert.pem -infiles newreq.pem
     RET=$?
     cat newcert.pem
     echo "Signed certificate is in newcert.pem"
     ;;
--signcert) 
+-signCA)
+    $CA -policy policy_anything -out newcert.pem -extensions v3_ca -infiles newreq.pem
+    RET=$?
+    echo "Signed CA certificate is in newcert.pem"
+    ;;
+-signcert)
     echo "Cert passphrase will be requested twice - bug?"
     $X509 -x509toreq -in newreq.pem -signkey newreq.pem -out tmp.pem
     $CA -policy policy_anything -out newcert.pem -infiles tmp.pem
+    RET=$?
     cat newcert.pem
     echo "Signed certificate is in newcert.pem"
     ;;
--verify) 
+-verify)
     shift
     if [ -z "$1" ]; then
            $VERIFY -CAfile $CATOP/$CACERT newcert.pem
@@ -127,13 +185,14 @@ case $i in
            fi
        done
     fi
-    exit 0
+    exit $RET
     ;;
 *)
-    echo "Unknown arg $i";
+    echo "Unknown arg $i" >&2
+    usage
     exit 1
     ;;
 esac
+shift
 done
 exit $RET
-

diff --git a/apps/openssl.c b/apps/openssl.c
index 8e2d8dd569de402ccadcc2e9d74792d416ed59a4..480fef9e14aed23f78487e0f4ba35e1caeec8cb2 100644 (file)
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -235,16 +235,19 @@ int main(int Argc, char *Argv[])
 
        in_FIPS_mode = 0;
 
-#ifdef OPENSSL_FIPS
        if(getenv("OPENSSL_FIPS")) {
+#ifdef OPENSSL_FIPS
                if (!FIPS_mode_set(1)) {
                        ERR_load_crypto_strings();
                        ERR_print_errors(BIO_new_fp(stderr,BIO_NOCLOSE));
                        EXIT(1);
                }
                in_FIPS_mode = 1;
-               }
+#else
+               fprintf(stderr, "FIPS mode not supported.\n");
+               EXIT(1);
 #endif
+               }
 
        if (bio_err == NULL)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)