projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no need to cast away the const
[oweals/openssl.git]
/
apps
/
CA.sh
diff --git
a/apps/CA.sh
b/apps/CA.sh
index d9f3069fb2a61888bc46d4ac5fe7f47869f8f715..a0b20d85a97546a67bebbccdce40b3947c7e00fa 100644
(file)
--- a/
apps/CA.sh
+++ b/
apps/CA.sh
@@
-30,14
+30,18
@@
# default openssl.cnf file has setup as per the following
# demoCA ... where everything is stored
# 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"
+if [ -z "$OPENSSL" ]; then OPENSSL=openssl; fi
+
+DAYS="-days 365" # 1 year
+CADAYS="-days 1095" # 3 years
+REQ="$OPENSSL req $SSLEAY_CONFIG"
+CA="$OPENSSL ca $SSLEAY_CONFIG"
+VERIFY="$OPENSSL verify"
+X509="$OPENSSL x509"
CATOP=./demoCA
CAKEY=./cakey.pem
CATOP=./demoCA
CAKEY=./cakey.pem
+CAREQ=./careq.pem
CACERT=./cacert.pem
for i
CACERT=./cacert.pem
for i
@@
-49,15
+53,15
@@
case $i in
;;
-newcert)
# create a certificate
;;
-newcert)
# create a certificate
- $REQ -new -x509 -keyout new
req.pem -out newreq
.pem $DAYS
+ $REQ -new -x509 -keyout new
key.pem -out newcert
.pem $DAYS
RET=$?
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
;;
-newreq)
# create a certificate request
- $REQ -new -keyout new
req
.pem -out newreq.pem $DAYS
+ $REQ -new -keyout new
key
.pem -out newreq.pem $DAYS
RET=$?
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
;;
-newca)
# if explicitly asked for or it doesn't exist then setup the directory
@@
-70,7
+74,7
@@
case $i in
mkdir ${CATOP}/crl
mkdir ${CATOP}/newcerts
mkdir ${CATOP}/private
mkdir ${CATOP}/crl
mkdir ${CATOP}/newcerts
mkdir ${CATOP}/private
- echo "0
1
" > ${CATOP}/serial
+ echo "0
0
" > ${CATOP}/serial
touch ${CATOP}/index.txt
fi
if [ ! -f ${CATOP}/private/$CAKEY ]; then
touch ${CATOP}/index.txt
fi
if [ ! -f ${CATOP}/private/$CAKEY ]; then
@@
-83,8
+87,11
@@
case $i in
RET=$?
else
echo "Making CA certificate ..."
RET=$?
else
echo "Making CA certificate ..."
- $REQ -new -x509 -keyout ${CATOP}/private/$CAKEY \
- -out ${CATOP}/$CACERT $DAYS
+ $REQ -new -keyout ${CATOP}/private/$CAKEY \
+ -out ${CATOP}/$CAREQ
+ $CA -out ${CATOP}/$CACERT $CADAYS -batch \
+ -keyfile ${CATOP}/private/$CAKEY -selfsign \
+ -infiles ${CATOP}/$CAREQ
RET=$?
fi
fi
RET=$?
fi
fi