projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sha-256/-512 naming in speed.c consistent with their names as they
[openssl.git]
/
apps
/
CA.sh
diff --git
a/apps/CA.sh
b/apps/CA.sh
index 1942b985a2b6ba203992f0cd910a9a9d90dceb3a..e63a2267eefebc593f6469782ffe6afb1b385839 100644
(file)
--- a/
apps/CA.sh
+++ b/
apps/CA.sh
@@
-27,17
+27,19
@@
# tjh@cryptsoft.com
#
# tjh@cryptsoft.com
#
-# default
ssleay
.cnf file has setup as per the following
+# default
openssl
.cnf file has setup as per the following
# demoCA ... where everything is stored
# demoCA ... where everything is stored
-DAYS="-days 365"
-REQ="ssleay req $SSLEAY_CONFIG"
-CA="ssleay ca $SSLEAY_CONFIG"
-VERIFY="ssleay verify"
-X509="ssleay x509"
+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
@@
-60,7
+62,7
@@
case $i in
echo "Request (and private key) is in newreq.pem"
;;
-newca)
echo "Request (and private key) is in newreq.pem"
;;
-newca)
- # if explictly asked for or it doesn't exist then setup the directory
+ # if explic
i
tly asked for or it doesn't exist then setup the directory
# structure that Eric likes to manage things
NEW="1"
if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
# structure that Eric likes to manage things
NEW="1"
if [ "$NEW" -o ! -f ${CATOP}/serial ]; then
@@
-70,7
+72,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
+85,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